Skip to content

Commit e11154e

Browse files
michaelbausormichaelbausor
authored
Update page (googleapis#1894)
- Use GAX page interface - Bump GAX version
1 parent 4576cd6 commit e11154e

124 files changed

Lines changed: 2119 additions & 1144 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ nosetests.xml
2424
.idea
2525
.settings
2626
.DS_Store
27+
.classpath
2728

2829
# Built documentation
2930
docs/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import static com.google.common.base.Preconditions.checkArgument;
2020

21+
import com.google.api.gax.core.Page;
2122
import com.google.cloud.FieldSelector;
2223
import com.google.cloud.FieldSelector.Helper;
23-
import com.google.cloud.Page;
2424
import com.google.cloud.Service;
2525
import com.google.cloud.bigquery.spi.v2.BigQueryRpc;
2626
import com.google.common.base.Function;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.google.api.services.bigquery.model.TableDataInsertAllRequest.Rows;
2525
import com.google.api.services.bigquery.model.TableRow;
2626
import com.google.cloud.BaseService;
27-
import com.google.cloud.Page;
27+
import com.google.api.gax.core.Page;
2828
import com.google.cloud.PageImpl;
2929
import com.google.cloud.PageImpl.NextPageFetcher;
3030
import com.google.cloud.RetryHelper;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21-
import com.google.cloud.Page;
21+
import com.google.api.gax.core.Page;
2222
import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption;
2323
import com.google.cloud.bigquery.BigQuery.DatasetOption;
2424
import com.google.cloud.bigquery.BigQuery.TableListOption;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public String toString() {
149149
.add("schema", schema)
150150
.add("totalBytesProcessed", totalBytesProcessed)
151151
.add("totalRows", totalRows)
152-
.add("cursor", getNextPageCursor())
152+
.add("cursor", getNextPageToken())
153153
.toString();
154154
}
155155

@@ -167,7 +167,7 @@ public final boolean equals(Object obj) {
167167
return false;
168168
}
169169
QueryResult response = (QueryResult) obj;
170-
return Objects.equals(getNextPageCursor(), response.getNextPageCursor())
170+
return Objects.equals(getNextPageToken(), response.getNextPageToken())
171171
&& Objects.equals(getValues(), response.getValues())
172172
&& Objects.equals(schema, response.schema)
173173
&& totalRows == response.totalRows

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21-
import com.google.cloud.Page;
21+
import com.google.api.gax.core.Page;
2222
import com.google.cloud.bigquery.BigQuery.JobOption;
2323
import com.google.cloud.bigquery.BigQuery.TableDataListOption;
2424
import com.google.cloud.bigquery.BigQuery.TableOption;

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

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

29-
import com.google.api.gax.core.RetrySettings;
3029
import com.google.api.services.bigquery.model.ErrorProto;
3130
import com.google.api.services.bigquery.model.GetQueryResultsResponse;
3231
import com.google.api.services.bigquery.model.TableCell;
3332
import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
3433
import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
3534
import com.google.api.services.bigquery.model.TableRow;
36-
import com.google.cloud.Page;
35+
import com.google.api.gax.core.Page;
3736
import com.google.cloud.ServiceOptions;
3837
import com.google.cloud.WriteChannel;
3938
import com.google.cloud.bigquery.InsertAllRequest.RowToInsert;
@@ -397,7 +396,7 @@ public void testListDatasets() {
397396
EasyMock.expect(bigqueryRpcMock.listDatasets(PROJECT, EMPTY_RPC_OPTIONS)).andReturn(result);
398397
EasyMock.replay(bigqueryRpcMock);
399398
Page<Dataset> page = bigquery.listDatasets();
400-
assertEquals(CURSOR, page.getNextPageCursor());
399+
assertEquals(CURSOR, page.getNextPageToken());
401400
assertArrayEquals(
402401
datasetList.toArray(), Iterables.toArray(page.getValues(), DatasetInfo.class));
403402
}
@@ -415,7 +414,7 @@ public void testListDatasetsWithProjects() {
415414
.andReturn(result);
416415
EasyMock.replay(bigqueryRpcMock);
417416
Page<Dataset> page = bigquery.listDatasets(OTHER_PROJECT);
418-
assertEquals(CURSOR, page.getNextPageCursor());
417+
assertEquals(CURSOR, page.getNextPageToken());
419418
assertArrayEquals(
420419
datasetList.toArray(), Iterables.toArray(page.getValues(), DatasetInfo.class));
421420
}
@@ -429,7 +428,7 @@ public void testListEmptyDatasets() {
429428
EasyMock.replay(bigqueryRpcMock);
430429
bigquery = options.getService();
431430
Page<Dataset> page = bigquery.listDatasets();
432-
assertNull(page.getNextPageCursor());
431+
assertNull(page.getNextPageToken());
433432
assertArrayEquals(
434433
ImmutableList.of().toArray(), Iterables.toArray(page.getValues(), Dataset.class));
435434
}
@@ -447,7 +446,7 @@ public void testListDatasetsWithOptions() {
447446
EasyMock.replay(bigqueryRpcMock);
448447
Page<Dataset> page =
449448
bigquery.listDatasets(DATASET_LIST_ALL, DATASET_LIST_PAGE_TOKEN, DATASET_LIST_PAGE_SIZE);
450-
assertEquals(CURSOR, page.getNextPageCursor());
449+
assertEquals(CURSOR, page.getNextPageToken());
451450
assertArrayEquals(
452451
datasetList.toArray(), Iterables.toArray(page.getValues(), DatasetInfo.class));
453452
}
@@ -618,7 +617,7 @@ public void testListTables() {
618617
.andReturn(result);
619618
EasyMock.replay(bigqueryRpcMock);
620619
Page<Table> page = bigquery.listTables(DATASET);
621-
assertEquals(CURSOR, page.getNextPageCursor());
620+
assertEquals(CURSOR, page.getNextPageToken());
622621
assertArrayEquals(tableList.toArray(), Iterables.toArray(page.getValues(), Table.class));
623622
}
624623

@@ -635,7 +634,7 @@ public void testListTablesFromDatasetId() {
635634
.andReturn(result);
636635
EasyMock.replay(bigqueryRpcMock);
637636
Page<Table> page = bigquery.listTables(DatasetId.of(DATASET));
638-
assertEquals(CURSOR, page.getNextPageCursor());
637+
assertEquals(CURSOR, page.getNextPageToken());
639638
assertArrayEquals(tableList.toArray(), Iterables.toArray(page.getValues(), Table.class));
640639
}
641640

@@ -651,7 +650,7 @@ public void testListTablesFromDatasetIdWithProject() {
651650
.andReturn(result);
652651
EasyMock.replay(bigqueryRpcMock);
653652
Page<Table> page = bigquery.listTables(DatasetId.of(OTHER_PROJECT, DATASET));
654-
assertEquals(CURSOR, page.getNextPageCursor());
653+
assertEquals(CURSOR, page.getNextPageToken());
655654
assertArrayEquals(tableList.toArray(), Iterables.toArray(page.getValues(), Table.class));
656655
}
657656

@@ -668,7 +667,7 @@ public void testListTablesWithOptions() {
668667
.andReturn(result);
669668
EasyMock.replay(bigqueryRpcMock);
670669
Page<Table> page = bigquery.listTables(DATASET, TABLE_LIST_PAGE_SIZE, TABLE_LIST_PAGE_TOKEN);
671-
assertEquals(CURSOR, page.getNextPageCursor());
670+
assertEquals(CURSOR, page.getNextPageToken());
672671
assertArrayEquals(tableList.toArray(), Iterables.toArray(page.getValues(), Table.class));
673672
}
674673

@@ -832,7 +831,7 @@ public void testListTableData() {
832831
EasyMock.replay(bigqueryRpcMock);
833832
bigquery = options.getService();
834833
Page<List<FieldValue>> page = bigquery.listTableData(DATASET, TABLE);
835-
assertEquals(CURSOR, page.getNextPageCursor());
834+
assertEquals(CURSOR, page.getNextPageToken());
836835
assertArrayEquals(TABLE_DATA.toArray(), Iterables.toArray(page.getValues(), List.class));
837836
}
838837

@@ -843,7 +842,7 @@ public void testListTableDataFromTableId() {
843842
EasyMock.replay(bigqueryRpcMock);
844843
bigquery = options.getService();
845844
Page<List<FieldValue>> page = bigquery.listTableData(TableId.of(DATASET, TABLE));
846-
assertEquals(CURSOR, page.getNextPageCursor());
845+
assertEquals(CURSOR, page.getNextPageToken());
847846
assertArrayEquals(TABLE_DATA.toArray(), Iterables.toArray(page.getValues(), List.class));
848847
}
849848

@@ -855,7 +854,7 @@ public void testListTableDataFromTableIdWithProject() {
855854
EasyMock.replay(bigqueryRpcMock);
856855
bigquery = options.getService();
857856
Page<List<FieldValue>> page = bigquery.listTableData(tableId);
858-
assertEquals(CURSOR, page.getNextPageCursor());
857+
assertEquals(CURSOR, page.getNextPageToken());
859858
assertArrayEquals(TABLE_DATA.toArray(), Iterables.toArray(page.getValues(), List.class));
860859
}
861860

@@ -872,7 +871,7 @@ public void testListTableDataWithOptions() {
872871
TABLE_DATA_LIST_PAGE_SIZE,
873872
TABLE_DATA_LIST_PAGE_TOKEN,
874873
TABLE_DATA_LIST_START_INDEX);
875-
assertEquals(CURSOR, page.getNextPageCursor());
874+
assertEquals(CURSOR, page.getNextPageToken());
876875
assertArrayEquals(TABLE_DATA.toArray(), Iterables.toArray(page.getValues(), List.class));
877876
}
878877

@@ -1016,7 +1015,7 @@ public com.google.api.services.bigquery.model.Job apply(Job job) {
10161015
EasyMock.expect(bigqueryRpcMock.listJobs(PROJECT, EMPTY_RPC_OPTIONS)).andReturn(result);
10171016
EasyMock.replay(bigqueryRpcMock);
10181017
Page<Job> page = bigquery.listJobs();
1019-
assertEquals(CURSOR, page.getNextPageCursor());
1018+
assertEquals(CURSOR, page.getNextPageToken());
10201019
assertArrayEquals(jobList.toArray(), Iterables.toArray(page.getValues(), Job.class));
10211020
}
10221021

@@ -1043,7 +1042,7 @@ public com.google.api.services.bigquery.model.Job apply(Job job) {
10431042
Page<Job> page =
10441043
bigquery.listJobs(
10451044
JOB_LIST_ALL_USERS, JOB_LIST_STATE_FILTER, JOB_LIST_PAGE_TOKEN, JOB_LIST_PAGE_SIZE);
1046-
assertEquals(CURSOR, page.getNextPageCursor());
1045+
assertEquals(CURSOR, page.getNextPageToken());
10471046
assertArrayEquals(jobList.toArray(), Iterables.toArray(page.getValues(), Job.class));
10481047
}
10491048

@@ -1070,7 +1069,7 @@ public com.google.api.services.bigquery.model.Job apply(Job job) {
10701069
.andReturn(result);
10711070
EasyMock.replay(bigqueryRpcMock);
10721071
Page<Job> page = bigquery.listJobs(JOB_LIST_OPTION_FIELD);
1073-
assertEquals(CURSOR, page.getNextPageCursor());
1072+
assertEquals(CURSOR, page.getNextPageToken());
10741073
assertArrayEquals(jobList.toArray(), Iterables.toArray(page.getValues(), Job.class));
10751074
String selector = (String) capturedOptions.getValue().get(JOB_OPTION_FIELDS.getRpcOption());
10761075
assertTrue(selector.contains("nextPageToken,jobs("));
@@ -1157,7 +1156,7 @@ public void testQueryRequestCompleted() {
11571156
assertEquals(false, row.get(0).getBooleanValue());
11581157
assertEquals(1L, row.get(1).getLongValue());
11591158
}
1160-
assertEquals(CURSOR, response.getResult().getNextPageCursor());
1159+
assertEquals(CURSOR, response.getResult().getNextPageToken());
11611160
}
11621161

11631162
@Test
@@ -1191,7 +1190,7 @@ public void testGetQueryResults() {
11911190
assertEquals(false, row.get(0).getBooleanValue());
11921191
assertEquals(1L, row.get(1).getLongValue());
11931192
}
1194-
assertEquals(CURSOR, response.getResult().getNextPageCursor());
1193+
assertEquals(CURSOR, response.getResult().getNextPageToken());
11951194
}
11961195

11971196
@Test
@@ -1225,7 +1224,7 @@ public void testGetQueryResultsWithProject() {
12251224
assertEquals(false, row.get(0).getBooleanValue());
12261225
assertEquals(1L, row.get(1).getLongValue());
12271226
}
1228-
assertEquals(CURSOR, response.getResult().getNextPageCursor());
1227+
assertEquals(CURSOR, response.getResult().getNextPageToken());
12291228
}
12301229

12311230
@Test
@@ -1263,7 +1262,7 @@ public void testGetQueryResultsWithOptions() {
12631262
assertEquals(false, row.get(0).getBooleanValue());
12641263
assertEquals(1L, row.get(1).getLongValue());
12651264
}
1266-
assertEquals(CURSOR, response.getResult().getNextPageCursor());
1265+
assertEquals(CURSOR, response.getResult().getNextPageToken());
12671266
}
12681267

12691268
@Test

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import static org.junit.Assert.assertSame;
3131
import static org.junit.Assert.assertTrue;
3232

33-
import com.google.cloud.Page;
33+
import com.google.api.gax.core.Page;
3434
import com.google.cloud.PageImpl;
3535
import com.google.common.collect.ImmutableList;
3636
import com.google.common.collect.Iterables;
@@ -253,7 +253,7 @@ public void testList() throws Exception {
253253
Page<Table> tablePage = dataset.list();
254254
assertArrayEquals(tableResults.toArray(),
255255
Iterables.toArray(tablePage.getValues(), Table.class));
256-
assertEquals(expectedPage.getNextPageCursor(), tablePage.getNextPageCursor());
256+
assertEquals(expectedPage.getNextPageToken(), tablePage.getNextPageToken());
257257
}
258258

259259
@Test
@@ -272,7 +272,7 @@ public void testListWithOptions() throws Exception {
272272
Page<Table> tablePage = dataset.list(BigQuery.TableListOption.pageSize(10L));
273273
assertArrayEquals(tableResults.toArray(),
274274
Iterables.toArray(tablePage.getValues(), Table.class));
275-
assertEquals(expectedPage.getNextPageCursor(), tablePage.getNextPageCursor());
275+
assertEquals(expectedPage.getNextPageToken(), tablePage.getNextPageToken());
276276
}
277277

278278
@Test

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ public void testBuilder() {
6464
assertEquals(TOTAL_ROWS, QUERY_RESULT.getTotalRows());
6565
assertEquals(TOTAL_BYTES_PROCESSED, QUERY_RESULT.getTotalBytesProcessed());
6666
assertEquals(CACHE_HIT, QUERY_RESULT.cacheHit());
67-
assertEquals(CURSOR, QUERY_RESULT.getNextPageCursor());
67+
assertEquals(CURSOR, QUERY_RESULT.getNextPageToken());
6868
assertEquals(null, QUERY_RESULT.getNextPage());
6969
assertEquals(null, QUERY_RESULT_INCOMPLETE.getSchema());
7070
assertEquals(0L, QUERY_RESULT_INCOMPLETE.getTotalRows());
7171
assertEquals(TOTAL_BYTES_PROCESSED, QUERY_RESULT_INCOMPLETE.getTotalBytesProcessed());
7272
assertEquals(false, QUERY_RESULT_INCOMPLETE.cacheHit());
73-
assertEquals(null, QUERY_RESULT_INCOMPLETE.getNextPageCursor());
73+
assertEquals(null, QUERY_RESULT_INCOMPLETE.getNextPageToken());
7474
assertEquals(null, QUERY_RESULT_INCOMPLETE.getNextPage());
7575
}
7676

@@ -84,7 +84,7 @@ public void testEquals() {
8484
private void compareQueryResult(QueryResult expected, QueryResult value) {
8585
assertEquals(expected, value);
8686
assertEquals(expected.getNextPage(), value.getNextPage());
87-
assertEquals(expected.getNextPageCursor(), value.getNextPageCursor());
87+
assertEquals(expected.getNextPageToken(), value.getNextPageToken());
8888
assertEquals(expected.getValues(), value.getValues());
8989
assertEquals(expected.getSchema(), value.getSchema());
9090
assertEquals(expected.getTotalRows(), value.getTotalRows());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import static org.junit.Assert.assertSame;
2929
import static org.junit.Assert.assertTrue;
3030

31-
import com.google.cloud.Page;
31+
import com.google.api.gax.core.Page;
3232
import com.google.cloud.PageImpl;
3333
import com.google.cloud.bigquery.InsertAllRequest.RowToInsert;
3434
import com.google.common.collect.ImmutableList;

0 commit comments

Comments
 (0)