Merge pull request #774 from mziccard/rename-next-page-token

Rename startPageToken to pageToken in Storage and BigQuery
googleapis · Mar 22, 2016 · 689bbb4 · 689bbb4
2 parents a78f0a7 + b7c6da4
commit 689bbb4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java
@@ -180,7 +180,7 @@ public static DatasetListOption pageSize(long pageSize) {
     /**
      * Returns an option to specify the page token from which to start listing datasets.
      */
-    public static DatasetListOption startPageToken(String pageToken) {
+    public static DatasetListOption pageToken(String pageToken) {
       return new DatasetListOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
     }
 
@@ -256,7 +256,7 @@ public static TableListOption pageSize(long pageSize) {
     /**
      * Returns an option to specify the page token from which to start listing tables.
      */
-    public static TableListOption startPageToken(String pageToken) {
+    public static TableListOption pageToken(String pageToken) {
       return new TableListOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
     }
   }
@@ -305,7 +305,7 @@ public static TableDataListOption pageSize(long pageSize) {
     /**
      * Returns an option to specify the page token from which to start listing table data.
      */
-    public static TableDataListOption startPageToken(String pageToken) {
+    public static TableDataListOption pageToken(String pageToken) {
       return new TableDataListOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
     }
 
@@ -362,7 +362,7 @@ public static JobListOption pageSize(long pageSize) {
     /**
      * Returns an option to specify the page token from which to start listing jobs.
      */
-    public static JobListOption startPageToken(String pageToken) {
+    public static JobListOption pageToken(String pageToken) {
       return new JobListOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
     }
 
@@ -428,7 +428,7 @@ public static QueryResultsOption pageSize(long pageSize) {
     /**
      * Returns an option to specify the page token from which to start getting query results.
      */
-    public static QueryResultsOption startPageToken(String pageToken) {
+    public static QueryResultsOption pageToken(String pageToken) {
       return new QueryResultsOption(BigQueryRpc.Option.PAGE_TOKEN, pageToken);
     }
 

diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java
@@ -169,7 +169,7 @@ public class BigQueryImplTest {
   private static final BigQuery.DatasetListOption DATASET_LIST_ALL =
       BigQuery.DatasetListOption.all();
   private static final BigQuery.DatasetListOption DATASET_LIST_PAGE_TOKEN =
-      BigQuery.DatasetListOption.startPageToken("cursor");
+      BigQuery.DatasetListOption.pageToken("cursor");
   private static final BigQuery.DatasetListOption DATASET_LIST_PAGE_SIZE =
       BigQuery.DatasetListOption.pageSize(42L);
   private static final Map<BigQueryRpc.Option, ?> DATASET_LIST_OPTIONS = ImmutableMap.of(
@@ -191,7 +191,7 @@ public class BigQueryImplTest {
   private static final BigQuery.TableListOption TABLE_LIST_PAGE_SIZE =
       BigQuery.TableListOption.pageSize(42L);
   private static final BigQuery.TableListOption TABLE_LIST_PAGE_TOKEN =
-      BigQuery.TableListOption.startPageToken("cursor");
+      BigQuery.TableListOption.pageToken("cursor");
   private static final Map<BigQueryRpc.Option, ?> TABLE_LIST_OPTIONS = ImmutableMap.of(
       BigQueryRpc.Option.MAX_RESULTS, 42L,
       BigQueryRpc.Option.PAGE_TOKEN, "cursor");
@@ -200,7 +200,7 @@ public class BigQueryImplTest {
   private static final BigQuery.TableDataListOption TABLE_DATA_LIST_PAGE_SIZE =
       BigQuery.TableDataListOption.pageSize(42L);
   private static final BigQuery.TableDataListOption TABLE_DATA_LIST_PAGE_TOKEN =
-      BigQuery.TableDataListOption.startPageToken("cursor");
+      BigQuery.TableDataListOption.pageToken("cursor");
   private static final BigQuery.TableDataListOption TABLE_DATA_LIST_START_INDEX =
       BigQuery.TableDataListOption.startIndex(0L);
   private static final Map<BigQueryRpc.Option, ?> TABLE_DATA_LIST_OPTIONS = ImmutableMap.of(
@@ -220,7 +220,7 @@ public class BigQueryImplTest {
   private static final BigQuery.JobListOption JOB_LIST_STATE_FILTER =
       BigQuery.JobListOption.stateFilter(JobStatus.State.DONE, JobStatus.State.PENDING);
   private static final BigQuery.JobListOption JOB_LIST_PAGE_TOKEN =
-      BigQuery.JobListOption.startPageToken("cursor");
+      BigQuery.JobListOption.pageToken("cursor");
   private static final BigQuery.JobListOption JOB_LIST_PAGE_SIZE =
       BigQuery.JobListOption.pageSize(42L);
   private static final Map<BigQueryRpc.Option, ?> JOB_LIST_OPTIONS = ImmutableMap.of(
@@ -235,7 +235,7 @@ public class BigQueryImplTest {
   private static final BigQuery.QueryResultsOption QUERY_RESULTS_OPTION_INDEX =
       BigQuery.QueryResultsOption.startIndex(1024L);
   private static final BigQuery.QueryResultsOption QUERY_RESULTS_OPTION_PAGE_TOKEN =
-      BigQuery.QueryResultsOption.startPageToken("cursor");
+      BigQuery.QueryResultsOption.pageToken("cursor");
   private static final BigQuery.QueryResultsOption QUERY_RESULTS_OPTION_PAGE_SIZE =
       BigQuery.QueryResultsOption.pageSize(0L);
   private static final Map<BigQueryRpc.Option, ?> QUERY_RESULTS_OPTIONS = ImmutableMap.of(

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -634,7 +634,7 @@ public static BucketListOption pageSize(long pageSize) {
     /**
      * Returns an option to specify the page token from which to start listing buckets.
      */
-    public static BucketListOption startPageToken(String pageToken) {
+    public static BucketListOption pageToken(String pageToken) {
       return new BucketListOption(StorageRpc.Option.PAGE_TOKEN, pageToken);
     }
 
@@ -680,7 +680,7 @@ public static BlobListOption pageSize(long pageSize) {
     /**
      * Returns an option to specify the page token from which to start listing blobs.
      */
-    public static BlobListOption startPageToken(String pageToken) {
+    public static BlobListOption pageToken(String pageToken) {
       return new BlobListOption(StorageRpc.Option.PAGE_TOKEN, pageToken);
     }