@@ -148,12 +148,12 @@ public class BigQueryImplTest {
148148 private static final TableRow TABLE_ROW =
149149 new TableRow ().setF (ImmutableList .of (BOOLEAN_FIELD , INTEGER_FIELD ));
150150 private static final QueryRequest QUERY_REQUEST = QueryRequest .builder ("SQL" )
151- .maxResults (42L )
151+ .pageSize (42L )
152152 .useQueryCache (false )
153153 .defaultDataset (DatasetId .of (DATASET ))
154154 .build ();
155155 private static final QueryRequest QUERY_REQUEST_WITH_PROJECT = QueryRequest .builder ("SQL" )
156- .maxResults (42L )
156+ .pageSize (42L )
157157 .useQueryCache (false )
158158 .defaultDataset (DatasetId .of (PROJECT , DATASET ))
159159 .build ();
@@ -170,8 +170,8 @@ public class BigQueryImplTest {
170170 BigQuery .DatasetListOption .all ();
171171 private static final BigQuery .DatasetListOption DATASET_LIST_PAGE_TOKEN =
172172 BigQuery .DatasetListOption .startPageToken ("cursor" );
173- private static final BigQuery .DatasetListOption DATASET_LIST_MAX_RESULTS =
174- BigQuery .DatasetListOption .maxResults (42L );
173+ private static final BigQuery .DatasetListOption DATASET_LIST_PAGE_SIZE =
174+ BigQuery .DatasetListOption .pageSize (42L );
175175 private static final Map <BigQueryRpc .Option , ?> DATASET_LIST_OPTIONS = ImmutableMap .of (
176176 BigQueryRpc .Option .ALL_DATASETS , true ,
177177 BigQueryRpc .Option .PAGE_TOKEN , "cursor" ,
@@ -188,17 +188,17 @@ public class BigQueryImplTest {
188188 BigQuery .TableOption .fields (BigQuery .TableField .SCHEMA , BigQuery .TableField .ETAG );
189189
190190 // Table list options
191- private static final BigQuery .TableListOption TABLE_LIST_MAX_RESULTS =
192- BigQuery .TableListOption .maxResults (42L );
191+ private static final BigQuery .TableListOption TABLE_LIST_PAGE_SIZE =
192+ BigQuery .TableListOption .pageSize (42L );
193193 private static final BigQuery .TableListOption TABLE_LIST_PAGE_TOKEN =
194194 BigQuery .TableListOption .startPageToken ("cursor" );
195195 private static final Map <BigQueryRpc .Option , ?> TABLE_LIST_OPTIONS = ImmutableMap .of (
196196 BigQueryRpc .Option .MAX_RESULTS , 42L ,
197197 BigQueryRpc .Option .PAGE_TOKEN , "cursor" );
198198
199199 // TableData list options
200- private static final BigQuery .TableDataListOption TABLE_DATA_LIST_MAX_RESULTS =
201- BigQuery .TableDataListOption .maxResults (42L );
200+ private static final BigQuery .TableDataListOption TABLE_DATA_LIST_PAGE_SIZE =
201+ BigQuery .TableDataListOption .pageSize (42L );
202202 private static final BigQuery .TableDataListOption TABLE_DATA_LIST_PAGE_TOKEN =
203203 BigQuery .TableDataListOption .startPageToken ("cursor" );
204204 private static final BigQuery .TableDataListOption TABLE_DATA_LIST_START_INDEX =
@@ -221,8 +221,8 @@ public class BigQueryImplTest {
221221 BigQuery .JobListOption .stateFilter (JobStatus .State .DONE , JobStatus .State .PENDING );
222222 private static final BigQuery .JobListOption JOB_LIST_PAGE_TOKEN =
223223 BigQuery .JobListOption .startPageToken ("cursor" );
224- private static final BigQuery .JobListOption JOB_LIST_MAX_RESULTS =
225- BigQuery .JobListOption .maxResults (42L );
224+ private static final BigQuery .JobListOption JOB_LIST_PAGE_SIZE =
225+ BigQuery .JobListOption .pageSize (42L );
226226 private static final Map <BigQueryRpc .Option , ?> JOB_LIST_OPTIONS = ImmutableMap .of (
227227 BigQueryRpc .Option .ALL_USERS , true ,
228228 BigQueryRpc .Option .STATE_FILTER , ImmutableList .of ("done" , "pending" ),
@@ -236,8 +236,8 @@ public class BigQueryImplTest {
236236 BigQuery .QueryResultsOption .startIndex (1024L );
237237 private static final BigQuery .QueryResultsOption QUERY_RESULTS_OPTION_PAGE_TOKEN =
238238 BigQuery .QueryResultsOption .startPageToken ("cursor" );
239- private static final BigQuery .QueryResultsOption QUERY_RESULTS_OPTION_MAX_RESULTS =
240- BigQuery .QueryResultsOption .maxResults (0L );
239+ private static final BigQuery .QueryResultsOption QUERY_RESULTS_OPTION_PAGE_SIZE =
240+ BigQuery .QueryResultsOption .pageSize (0L );
241241 private static final Map <BigQueryRpc .Option , ?> QUERY_RESULTS_OPTIONS = ImmutableMap .of (
242242 BigQueryRpc .Option .TIMEOUT , 42L ,
243243 BigQueryRpc .Option .START_INDEX , 1024L ,
@@ -388,7 +388,7 @@ public void testListDatasetsWithOptions() {
388388 EasyMock .expect (bigqueryRpcMock .listDatasets (DATASET_LIST_OPTIONS )).andReturn (result );
389389 EasyMock .replay (bigqueryRpcMock );
390390 Page <Dataset > page = bigquery .listDatasets (DATASET_LIST_ALL , DATASET_LIST_PAGE_TOKEN ,
391- DATASET_LIST_MAX_RESULTS );
391+ DATASET_LIST_PAGE_SIZE );
392392 assertEquals (cursor , page .nextPageCursor ());
393393 assertArrayEquals (datasetList .toArray (), Iterables .toArray (page .values (), DatasetInfo .class ));
394394 }
@@ -560,7 +560,7 @@ public void testListTablesWithOptions() {
560560 Tuple .of (cursor , Iterables .transform (tableList , TableInfo .TO_PB_FUNCTION ));
561561 EasyMock .expect (bigqueryRpcMock .listTables (DATASET , TABLE_LIST_OPTIONS )).andReturn (result );
562562 EasyMock .replay (bigqueryRpcMock );
563- Page <Table > page = bigquery .listTables (DATASET , TABLE_LIST_MAX_RESULTS , TABLE_LIST_PAGE_TOKEN );
563+ Page <Table > page = bigquery .listTables (DATASET , TABLE_LIST_PAGE_SIZE , TABLE_LIST_PAGE_TOKEN );
564564 assertEquals (cursor , page .nextPageCursor ());
565565 assertArrayEquals (tableList .toArray (), Iterables .toArray (page .values (), Table .class ));
566566 }
@@ -733,7 +733,7 @@ public void testListTableDataWithOptions() {
733733 EasyMock .replay (bigqueryRpcMock );
734734 bigquery = options .service ();
735735 Page <List <FieldValue >> page = bigquery .listTableData (DATASET , TABLE ,
736- TABLE_DATA_LIST_MAX_RESULTS , TABLE_DATA_LIST_PAGE_TOKEN , TABLE_DATA_LIST_START_INDEX );
736+ TABLE_DATA_LIST_PAGE_SIZE , TABLE_DATA_LIST_PAGE_TOKEN , TABLE_DATA_LIST_START_INDEX );
737737 assertEquals (cursor , page .nextPageCursor ());
738738 assertArrayEquals (tableData .toArray (), Iterables .toArray (page .values (), List .class ));
739739 }
@@ -859,7 +859,7 @@ public com.google.api.services.bigquery.model.Job apply(Job job) {
859859 EasyMock .expect (bigqueryRpcMock .listJobs (JOB_LIST_OPTIONS )).andReturn (result );
860860 EasyMock .replay (bigqueryRpcMock );
861861 Page <Job > page = bigquery .listJobs (JOB_LIST_ALL_USERS , JOB_LIST_STATE_FILTER ,
862- JOB_LIST_PAGE_TOKEN , JOB_LIST_MAX_RESULTS );
862+ JOB_LIST_PAGE_TOKEN , JOB_LIST_PAGE_SIZE );
863863 assertEquals (cursor , page .nextPageCursor ());
864864 assertArrayEquals (jobList .toArray (), Iterables .toArray (page .values (), Job .class ));
865865 }
@@ -1012,7 +1012,7 @@ public void testGetQueryResultsWithOptions() {
10121012 EasyMock .replay (bigqueryRpcMock );
10131013 bigquery = options .service ();
10141014 QueryResponse response = bigquery .getQueryResults (queryJob , QUERY_RESULTS_OPTION_TIME ,
1015- QUERY_RESULTS_OPTION_INDEX , QUERY_RESULTS_OPTION_MAX_RESULTS ,
1015+ QUERY_RESULTS_OPTION_INDEX , QUERY_RESULTS_OPTION_PAGE_SIZE ,
10161016 QUERY_RESULTS_OPTION_PAGE_TOKEN );
10171017 assertEquals (queryJob , response .jobId ());
10181018 assertEquals (true , response .jobCompleted ());
0 commit comments