From f99d48252fe494165244f093afb440db2bc238b6 Mon Sep 17 00:00:00 2001 From: Michael Bausor Date: Mon, 10 Apr 2017 17:03:59 -0700 Subject: [PATCH 01/15] Changes in core --- .../main/java/com/google/cloud/AsyncPage.java | 1 + .../java/com/google/cloud/AsyncPageImpl.java | 3 +- .../src/main/java/com/google/cloud/Page.java | 70 ------------------- .../main/java/com/google/cloud/PageImpl.java | 17 +++-- 4 files changed, 16 insertions(+), 75 deletions(-) delete mode 100644 google-cloud-core/src/main/java/com/google/cloud/Page.java diff --git a/google-cloud-core/src/main/java/com/google/cloud/AsyncPage.java b/google-cloud-core/src/main/java/com/google/cloud/AsyncPage.java index abc1c360288d..038cc9fae1e7 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/AsyncPage.java +++ b/google-cloud-core/src/main/java/com/google/cloud/AsyncPage.java @@ -17,6 +17,7 @@ package com.google.cloud; import com.google.api.gax.core.ApiFuture; +import com.google.api.gax.core.Page; /** * Interface for asynchronously consuming Google Cloud paginated results. diff --git a/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java b/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java index e2d27d75bcdf..7d617c4e0fc2 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java +++ b/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java @@ -18,6 +18,7 @@ import com.google.api.gax.core.ApiFuture; import com.google.api.gax.core.ApiFutures; +import com.google.api.gax.core.Page; import com.google.common.base.Throwables; import com.google.common.util.concurrent.Uninterruptibles; import java.io.Serializable; @@ -76,7 +77,7 @@ public AsyncPageImpl(NextPageFetcher asyncPageFetcher, String cursor, Iterabl @Override public ApiFuture> getNextPageAsync() { - if (getNextPageCursor() == null || asyncPageFetcher == null) { + if (getNextPageToken() == null || asyncPageFetcher == null) { return ApiFutures.immediateFuture(null); } return asyncPageFetcher.getNextPage(); diff --git a/google-cloud-core/src/main/java/com/google/cloud/Page.java b/google-cloud-core/src/main/java/com/google/cloud/Page.java deleted file mode 100644 index 03cbe566d470..000000000000 --- a/google-cloud-core/src/main/java/com/google/cloud/Page.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2015 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud; - -import java.util.Iterator; - -/** - * Interface for Google Cloud paginated results. - * - *

Use {@code Page} to iterate through all values (also in next pages): - * 

 {@code
- * Page page = ...; // get a Page instance
- * Iterator iterator = page.iterateAll();
- * while (iterator.hasNext()) {
- *   T value = iterator.next();
- *   // do something with value
- * }}
- * - *

Or handle pagination explicitly: - * 

 {@code
- * Page page = ...; // get a Page instance
- * while (page != null) {
- *   for (T value : page.getValues()) {
- *     // do something with value
- *   }
- *   page = page.getNextPage();
- * }}
- * - * @param the value type that the page holds - */ -public interface Page { - - - /** - * Returns the values contained in this page. - */ - Iterable getValues(); - - /** - * Returns an iterator for all values, possibly also in the next pages. Once current page's values - * are traversed the iterator fetches next page, if any. - */ - Iterator iterateAll(); - - - /** - * Returns the cursor for the nextPage or {@code null} if no more results. - */ - String getNextPageCursor(); - - - /** - * Returns the next page of results or {@code null} if no more result. - */ - Page getNextPage(); -} diff --git a/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java b/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java index 37b7fd9dee08..ac329aab449d 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java +++ b/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java @@ -16,6 +16,7 @@ package com.google.cloud; +import com.google.api.gax.core.Page; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableMap; @@ -81,20 +82,28 @@ public PageImpl(NextPageFetcher pageFetcher, String cursor, Iterable resul this.results = results; } - @Override public Iterable getValues() { return results == null ? Collections.emptyList() : results; } @Override - public Iterator iterateAll() { - return new PageIterator<>(this); + public Iterable iterateAll() { + return new Iterable() { + @Override + public Iterator iterator() { + return new PageIterator<>(PageImpl.this); + } + }; } + @Override + public boolean hasNextPage() { + return getNextPageToken() != null && !getNextPageToken().equals(""); + } @Override - public String getNextPageCursor() { + public String getNextPageToken() { return cursor; } From 466da4002fc461405f651e84ea5a9e71eb3d9ee2 Mon Sep 17 00:00:00 2001 From: Michael Bausor Date: Mon, 10 Apr 2017 17:07:42 -0700 Subject: [PATCH 02/15] Update BigQuery, Compute, Dns --- .../main/java/com/google/cloud/bigquery/BigQuery.java | 2 +- .../java/com/google/cloud/bigquery/BigQueryImpl.java | 2 +- .../main/java/com/google/cloud/bigquery/Dataset.java | 2 +- .../java/com/google/cloud/bigquery/QueryResult.java | 11 +++++------ .../main/java/com/google/cloud/bigquery/Table.java | 2 +- .../main/java/com/google/cloud/compute/Compute.java | 2 +- .../java/com/google/cloud/compute/ComputeImpl.java | 2 +- .../src/main/java/com/google/cloud/dns/Dns.java | 2 +- .../src/main/java/com/google/cloud/dns/DnsBatch.java | 2 +- .../src/main/java/com/google/cloud/dns/DnsImpl.java | 2 +- .../src/main/java/com/google/cloud/dns/Zone.java | 2 +- 11 files changed, 15 insertions(+), 16 deletions(-) diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java index 43a993f10c33..e54163a6e849 100644 --- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java +++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java @@ -18,9 +18,9 @@ import static com.google.common.base.Preconditions.checkArgument; +import com.google.api.gax.core.Page; import com.google.cloud.FieldSelector; import com.google.cloud.FieldSelector.Helper; -import com.google.cloud.Page; import com.google.cloud.Service; import com.google.cloud.bigquery.spi.v2.BigQueryRpc; import com.google.common.base.Function; diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java index a058d125c818..001bc1354cd4 100644 --- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java +++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java @@ -24,7 +24,7 @@ import com.google.api.services.bigquery.model.TableDataInsertAllRequest.Rows; import com.google.api.services.bigquery.model.TableRow; import com.google.cloud.BaseService; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import com.google.cloud.PageImpl; import com.google.cloud.PageImpl.NextPageFetcher; import com.google.cloud.RetryHelper; diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java index c1b549e41635..0db54e836c00 100644 --- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java +++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java @@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption; import com.google.cloud.bigquery.BigQuery.DatasetOption; import com.google.cloud.bigquery.BigQuery.TableListOption; diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java index 58efecf5a7c4..2dbd9e77f971 100644 --- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java +++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java @@ -128,8 +128,7 @@ public long getTotalBytesProcessed() { /** * Returns the total number of rows in the complete query result set, which can be more than the - * number of rows in the first page of results returned by {@link #getValues()}. Returns {@code 0} - * if the query was a dry run. + * number of rows in the first page of results. Returns {@code 0} if the query was a dry run. */ public long getTotalRows() { return totalRows; @@ -144,12 +143,12 @@ public QueryResult getNextPage() { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("rows", getValues()) + .add("rows", this) .add("cacheHit", cacheHit) .add("schema", schema) .add("totalBytesProcessed", totalBytesProcessed) .add("totalRows", totalRows) - .add("cursor", getNextPageCursor()) + .add("cursor", getNextPageToken()) .toString(); } @@ -167,8 +166,8 @@ public final boolean equals(Object obj) { return false; } QueryResult response = (QueryResult) obj; - return Objects.equals(getNextPageCursor(), response.getNextPageCursor()) - && Objects.equals(getValues(), response.getValues()) + return Objects.equals(getNextPageToken(), response.getNextPageToken()) + && Objects.equals(this.getValues(), response.getValues()) && Objects.equals(schema, response.schema) && totalRows == response.totalRows && totalBytesProcessed == response.totalBytesProcessed diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java index 27a99c0deb36..9fd88c6d0d2a 100644 --- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java +++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java @@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import com.google.cloud.bigquery.BigQuery.JobOption; import com.google.cloud.bigquery.BigQuery.TableDataListOption; import com.google.cloud.bigquery.BigQuery.TableOption; diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/Compute.java b/google-cloud-compute/src/main/java/com/google/cloud/compute/Compute.java index e568f1a50d83..700bc916ca8d 100644 --- a/google-cloud-compute/src/main/java/com/google/cloud/compute/Compute.java +++ b/google-cloud-compute/src/main/java/com/google/cloud/compute/Compute.java @@ -20,7 +20,7 @@ import com.google.cloud.FieldSelector; import com.google.cloud.FieldSelector.Helper; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import com.google.cloud.Service; import com.google.cloud.compute.AttachedDisk.PersistentDiskConfiguration; import com.google.cloud.compute.NetworkInterface.AccessConfig; diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/ComputeImpl.java b/google-cloud-compute/src/main/java/com/google/cloud/compute/ComputeImpl.java index 6c41c61dfe16..2ed72f444d73 100644 --- a/google-cloud-compute/src/main/java/com/google/cloud/compute/ComputeImpl.java +++ b/google-cloud-compute/src/main/java/com/google/cloud/compute/ComputeImpl.java @@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.cloud.BaseService; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import com.google.cloud.PageImpl; import com.google.cloud.PageImpl.NextPageFetcher; import com.google.cloud.RetryHelper; diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/Dns.java b/google-cloud-dns/src/main/java/com/google/cloud/dns/Dns.java index a56bed8ea2fe..8da867fb8b52 100644 --- a/google-cloud-dns/src/main/java/com/google/cloud/dns/Dns.java +++ b/google-cloud-dns/src/main/java/com/google/cloud/dns/Dns.java @@ -18,7 +18,7 @@ import com.google.cloud.FieldSelector; import com.google.cloud.FieldSelector.Helper; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import com.google.cloud.Service; import com.google.cloud.dns.spi.v1.DnsRpc; import com.google.common.collect.ImmutableList; diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatch.java b/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatch.java index 8711520cfb2e..84ab7a71a6fc 100644 --- a/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatch.java +++ b/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatch.java @@ -26,7 +26,7 @@ import com.google.api.services.dns.model.Project; import com.google.api.services.dns.model.ResourceRecordSet; import com.google.api.services.dns.model.ResourceRecordSetsListResponse; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import com.google.cloud.PageImpl; import com.google.cloud.dns.spi.v1.DnsRpc; import com.google.cloud.dns.spi.v1.RpcBatch; diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsImpl.java b/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsImpl.java index 9bbff2fd27a6..55e7403a505d 100644 --- a/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsImpl.java +++ b/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsImpl.java @@ -24,7 +24,7 @@ import com.google.api.services.dns.model.Project; import com.google.api.services.dns.model.ResourceRecordSet; import com.google.cloud.BaseService; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import com.google.cloud.PageImpl; import com.google.cloud.RetryHelper; import com.google.cloud.dns.spi.v1.DnsRpc; diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/Zone.java b/google-cloud-dns/src/main/java/com/google/cloud/dns/Zone.java index 4dbbfc7b1b3e..37afd01bc602 100644 --- a/google-cloud-dns/src/main/java/com/google/cloud/dns/Zone.java +++ b/google-cloud-dns/src/main/java/com/google/cloud/dns/Zone.java @@ -19,7 +19,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.api.services.dns.model.ManagedZone; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import java.io.IOException; import java.io.ObjectInputStream; From 6183bff46f10781192c0b8c26465c16b19c580e9 Mon Sep 17 00:00:00 2001 From: Michael Bausor Date: Mon, 10 Apr 2017 17:08:27 -0700 Subject: [PATCH 03/15] Error reporting, monitoring, logging --- .../spi/v1beta1/ErrorStatsServiceClient.java | 12 +- .../v1beta1/ErrorStatsServiceSettings.java | 40 +- .../spi/v1beta1/PagedResponseWrappers.java | 167 ++++++- .../v1beta1/ErrorStatsServiceClientTest.java | 4 +- .../com/google/cloud/logging/Logging.java | 2 +- .../com/google/cloud/logging/LoggingImpl.java | 2 +- .../cloud/logging/spi/v2/ConfigClient.java | 6 +- .../cloud/logging/spi/v2/ConfigSettings.java | 20 +- .../cloud/logging/spi/v2/LoggingClient.java | 16 +- .../cloud/logging/spi/v2/LoggingSettings.java | 63 ++- .../cloud/logging/spi/v2/MetricsClient.java | 6 +- .../cloud/logging/spi/v2/MetricsSettings.java | 20 +- .../logging/spi/v2/PagedResponseWrappers.java | 411 +++++++++++++++-- .../logging/spi/v2/ConfigClientTest.java | 2 +- .../logging/spi/v2/LoggingClientTest.java | 4 +- .../logging/spi/v2/MetricsClientTest.java | 2 +- .../monitoring/spi/v3/GroupServiceClient.java | 10 +- .../spi/v3/GroupServiceSettings.java | 42 +- .../spi/v3/MetricServiceClient.java | 18 +- .../spi/v3/MetricServiceSettings.java | 69 +-- .../spi/v3/PagedResponseWrappers.java | 431 +++++++++++++++--- .../spi/v3/GroupServiceClientTest.java | 2 +- .../spi/v3/MetricServiceClientTest.java | 6 +- 23 files changed, 1093 insertions(+), 262 deletions(-) diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClient.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClient.java index 013fdd430213..755495dfe7c0 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClient.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClient.java @@ -181,7 +181,7 @@ public final ErrorStatsServiceSettings getSettings() { * try (ErrorStatsServiceClient errorStatsServiceClient = ErrorStatsServiceClient.create()) { * ProjectName projectName = ProjectName.create("[PROJECT]"); * QueryTimeRange timeRange = QueryTimeRange.newBuilder().build(); - * for (ErrorGroupStats element : errorStatsServiceClient.listGroupStats(projectName, timeRange).iterateAllElements()) { + * for (ErrorGroupStats element : errorStatsServiceClient.listGroupStats(projectName, timeRange).iterateAll()) { * // doThingsWith(element); * } * } @@ -224,7 +224,7 @@ public final ListGroupStatsPagedResponse listGroupStats( * .setProjectNameWithProjectName(projectName) * .setTimeRange(timeRange) * .build(); - * for (ErrorGroupStats element : errorStatsServiceClient.listGroupStats(request).iterateAllElements()) { + * for (ErrorGroupStats element : errorStatsServiceClient.listGroupStats(request).iterateAll()) { * // doThingsWith(element); * } * } @@ -253,7 +253,7 @@ public final ListGroupStatsPagedResponse listGroupStats(ListGroupStatsRequest re * .build(); * ApiFuture<ListGroupStatsPagedResponse> future = errorStatsServiceClient.listGroupStatsPagedCallable().futureCall(request); * // Do something - * for (ErrorGroupStats element : future.get().iterateAllElements()) { + * for (ErrorGroupStats element : future.get().iterateAll()) { * // doThingsWith(element); * } * } @@ -308,7 +308,7 @@ public final ListGroupStatsPagedResponse listGroupStats(ListGroupStatsRequest re * try (ErrorStatsServiceClient errorStatsServiceClient = ErrorStatsServiceClient.create()) { * ProjectName projectName = ProjectName.create("[PROJECT]"); * String groupId = ""; - * for (ErrorEvent element : errorStatsServiceClient.listEvents(projectName, groupId).iterateAllElements()) { + * for (ErrorEvent element : errorStatsServiceClient.listEvents(projectName, groupId).iterateAll()) { * // doThingsWith(element); * } * } @@ -343,7 +343,7 @@ public final ListEventsPagedResponse listEvents(ProjectName projectName, String * .setProjectNameWithProjectName(projectName) * .setGroupId(groupId) * .build(); - * for (ErrorEvent element : errorStatsServiceClient.listEvents(request).iterateAllElements()) { + * for (ErrorEvent element : errorStatsServiceClient.listEvents(request).iterateAll()) { * // doThingsWith(element); * } * } @@ -372,7 +372,7 @@ public final ListEventsPagedResponse listEvents(ListEventsRequest request) { * .build(); * ApiFuture<ListEventsPagedResponse> future = errorStatsServiceClient.listEventsPagedCallable().futureCall(request); * // Do something - * for (ErrorEvent element : future.get().iterateAllElements()) { + * for (ErrorEvent element : future.get().iterateAll()) { * // doThingsWith(element); * } * } diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java index 20a233a7fba4..4046f29363da 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java @@ -18,6 +18,7 @@ import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListEventsPagedResponse; import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse; +import com.google.api.gax.core.ApiFuture; import com.google.api.gax.core.GoogleCredentialsProvider; import com.google.api.gax.core.PropertiesProvider; import com.google.api.gax.core.RetrySettings; @@ -27,6 +28,7 @@ import com.google.api.gax.grpc.ExecutorProvider; import com.google.api.gax.grpc.InstantiatingChannelProvider; import com.google.api.gax.grpc.InstantiatingExecutorProvider; +import com.google.api.gax.grpc.PageContext; import com.google.api.gax.grpc.PagedCallSettings; import com.google.api.gax.grpc.PagedListDescriptor; import com.google.api.gax.grpc.PagedListResponseFactory; @@ -199,13 +201,13 @@ private ErrorStatsServiceSettings(Builder settingsBuilder) throws IOException { new PagedListDescriptor< ListGroupStatsRequest, ListGroupStatsResponse, ErrorGroupStats>() { @Override - public Object emptyToken() { + public String emptyToken() { return ""; } @Override - public ListGroupStatsRequest injectToken(ListGroupStatsRequest payload, Object token) { - return ListGroupStatsRequest.newBuilder(payload).setPageToken((String) token).build(); + public ListGroupStatsRequest injectToken(ListGroupStatsRequest payload, String token) { + return ListGroupStatsRequest.newBuilder(payload).setPageToken(token).build(); } @Override @@ -220,7 +222,7 @@ public Integer extractPageSize(ListGroupStatsRequest payload) { } @Override - public Object extractNextToken(ListGroupStatsResponse payload) { + public String extractNextToken(ListGroupStatsResponse payload) { return payload.getNextPageToken(); } @@ -234,13 +236,13 @@ public Iterable extractResources(ListGroupStatsResponse payload LIST_EVENTS_PAGE_STR_DESC = new PagedListDescriptor() { @Override - public Object emptyToken() { + public String emptyToken() { return ""; } @Override - public ListEventsRequest injectToken(ListEventsRequest payload, Object token) { - return ListEventsRequest.newBuilder(payload).setPageToken((String) token).build(); + public ListEventsRequest injectToken(ListEventsRequest payload, String token) { + return ListEventsRequest.newBuilder(payload).setPageToken(token).build(); } @Override @@ -254,7 +256,7 @@ public Integer extractPageSize(ListEventsRequest payload) { } @Override - public Object extractNextToken(ListEventsResponse payload) { + public String extractNextToken(ListEventsResponse payload) { return payload.getNextPageToken(); } @@ -270,12 +272,16 @@ public Iterable extractResources(ListEventsResponse payload) { new PagedListResponseFactory< ListGroupStatsRequest, ListGroupStatsResponse, ListGroupStatsPagedResponse>() { @Override - public ListGroupStatsPagedResponse createPagedListResponse( + public ApiFuture getFuturePagedResponse( UnaryCallable callable, ListGroupStatsRequest request, - CallContext context) { - return new ListGroupStatsPagedResponse( - callable, LIST_GROUP_STATS_PAGE_STR_DESC, request, context); + CallContext context, + ApiFuture futureResponse) { + PageContext + pageContext = + PageContext.create( + callable, LIST_GROUP_STATS_PAGE_STR_DESC, request, context); + return ListGroupStatsPagedResponse.createAsync(pageContext, futureResponse); } }; @@ -285,12 +291,14 @@ public ListGroupStatsPagedResponse createPagedListResponse( new PagedListResponseFactory< ListEventsRequest, ListEventsResponse, ListEventsPagedResponse>() { @Override - public ListEventsPagedResponse createPagedListResponse( + public ApiFuture getFuturePagedResponse( UnaryCallable callable, ListEventsRequest request, - CallContext context) { - return new ListEventsPagedResponse( - callable, LIST_EVENTS_PAGE_STR_DESC, request, context); + CallContext context, + ApiFuture futureResponse) { + PageContext pageContext = + PageContext.create(callable, LIST_EVENTS_PAGE_STR_DESC, request, context); + return ListEventsPagedResponse.createAsync(pageContext, futureResponse); } }; diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/PagedResponseWrappers.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/PagedResponseWrappers.java index 070fee864afe..79554b3e7b9e 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/PagedResponseWrappers.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/PagedResponseWrappers.java @@ -15,10 +15,13 @@ */ package com.google.cloud.errorreporting.spi.v1beta1; -import com.google.api.gax.grpc.CallContext; -import com.google.api.gax.grpc.PagedListDescriptor; -import com.google.api.gax.grpc.PagedListResponseImpl; -import com.google.api.gax.grpc.UnaryCallable; +import com.google.api.gax.core.ApiFunction; +import com.google.api.gax.core.ApiFuture; +import com.google.api.gax.core.ApiFutures; +import com.google.api.gax.grpc.AbstractFixedSizeCollection; +import com.google.api.gax.grpc.AbstractPage; +import com.google.api.gax.grpc.AbstractPagedListResponse; +import com.google.api.gax.grpc.PageContext; import com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent; import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats; import com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest; @@ -26,6 +29,7 @@ import com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest; import com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse; import com.google.protobuf.ExperimentalApi; +import java.util.List; import javax.annotation.Generated; // AUTO-GENERATED DOCUMENTATION AND CLASS @@ -39,28 +43,149 @@ public class PagedResponseWrappers { public static class ListGroupStatsPagedResponse - extends PagedListResponseImpl< - ListGroupStatsRequest, ListGroupStatsResponse, ErrorGroupStats> { + extends AbstractPagedListResponse< + ListGroupStatsRequest, ListGroupStatsResponse, ErrorGroupStats, ListGroupStatsPage, + ListGroupStatsFixedSizeCollection> { - public ListGroupStatsPagedResponse( - UnaryCallable callable, - PagedListDescriptor - pageDescriptor, - ListGroupStatsRequest request, - CallContext context) { - super(callable, pageDescriptor, request, context); + public static ApiFuture createAsync( + PageContext context, + ApiFuture futureResponse) { + ApiFuture futurePage = + ListGroupStatsPage.createEmptyPage().createPageAsync(context, futureResponse); + return ApiFutures.transform( + futurePage, + new ApiFunction() { + @Override + public ListGroupStatsPagedResponse apply(ListGroupStatsPage input) { + return new ListGroupStatsPagedResponse(input); + } + }); + } + + private ListGroupStatsPagedResponse(ListGroupStatsPage page) { + super(page, ListGroupStatsFixedSizeCollection.createEmptyCollection()); + } + } + + public static class ListGroupStatsPage + extends AbstractPage< + ListGroupStatsRequest, ListGroupStatsResponse, ErrorGroupStats, ListGroupStatsPage> { + + private ListGroupStatsPage( + PageContext context, + ListGroupStatsResponse response) { + super(context, response); + } + + private static ListGroupStatsPage createEmptyPage() { + return new ListGroupStatsPage(null, null); + } + + @Override + protected ListGroupStatsPage createPage( + PageContext context, + ListGroupStatsResponse response) { + return new ListGroupStatsPage(context, response); + } + + @Override + protected ApiFuture createPageAsync( + PageContext context, + ApiFuture futureResponse) { + return super.createPageAsync(context, futureResponse); + } + } + + public static class ListGroupStatsFixedSizeCollection + extends AbstractFixedSizeCollection< + ListGroupStatsRequest, ListGroupStatsResponse, ErrorGroupStats, ListGroupStatsPage, + ListGroupStatsFixedSizeCollection> { + + private ListGroupStatsFixedSizeCollection(List pages, int collectionSize) { + super(pages, collectionSize); + } + + private static ListGroupStatsFixedSizeCollection createEmptyCollection() { + return new ListGroupStatsFixedSizeCollection(null, 0); + } + + @Override + protected ListGroupStatsFixedSizeCollection createCollection( + List pages, int collectionSize) { + return new ListGroupStatsFixedSizeCollection(pages, collectionSize); } } public static class ListEventsPagedResponse - extends PagedListResponseImpl { - - public ListEventsPagedResponse( - UnaryCallable callable, - PagedListDescriptor pageDescriptor, - ListEventsRequest request, - CallContext context) { - super(callable, pageDescriptor, request, context); + extends AbstractPagedListResponse< + ListEventsRequest, ListEventsResponse, ErrorEvent, ListEventsPage, + ListEventsFixedSizeCollection> { + + public static ApiFuture createAsync( + PageContext context, + ApiFuture futureResponse) { + ApiFuture futurePage = + ListEventsPage.createEmptyPage().createPageAsync(context, futureResponse); + return ApiFutures.transform( + futurePage, + new ApiFunction() { + @Override + public ListEventsPagedResponse apply(ListEventsPage input) { + return new ListEventsPagedResponse(input); + } + }); + } + + private ListEventsPagedResponse(ListEventsPage page) { + super(page, ListEventsFixedSizeCollection.createEmptyCollection()); + } + } + + public static class ListEventsPage + extends AbstractPage { + + private ListEventsPage( + PageContext context, + ListEventsResponse response) { + super(context, response); + } + + private static ListEventsPage createEmptyPage() { + return new ListEventsPage(null, null); + } + + @Override + protected ListEventsPage createPage( + PageContext context, + ListEventsResponse response) { + return new ListEventsPage(context, response); + } + + @Override + protected ApiFuture createPageAsync( + PageContext context, + ApiFuture futureResponse) { + return super.createPageAsync(context, futureResponse); + } + } + + public static class ListEventsFixedSizeCollection + extends AbstractFixedSizeCollection< + ListEventsRequest, ListEventsResponse, ErrorEvent, ListEventsPage, + ListEventsFixedSizeCollection> { + + private ListEventsFixedSizeCollection(List pages, int collectionSize) { + super(pages, collectionSize); + } + + private static ListEventsFixedSizeCollection createEmptyCollection() { + return new ListEventsFixedSizeCollection(null, 0); + } + + @Override + protected ListEventsFixedSizeCollection createCollection( + List pages, int collectionSize) { + return new ListEventsFixedSizeCollection(pages, collectionSize); } } } diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClientTest.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClientTest.java index 76b3f535a433..bfd56e754cb0 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClientTest.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClientTest.java @@ -104,7 +104,7 @@ public void listGroupStatsTest() { ListGroupStatsPagedResponse pagedListResponse = client.listGroupStats(projectName, timeRange); - List resources = Lists.newArrayList(pagedListResponse.iterateAllElements()); + List resources = Lists.newArrayList(pagedListResponse.iterateAll()); Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getErrorGroupStatsList().get(0), resources.get(0)); @@ -151,7 +151,7 @@ public void listEventsTest() { ListEventsPagedResponse pagedListResponse = client.listEvents(projectName, groupId); - List resources = Lists.newArrayList(pagedListResponse.iterateAllElements()); + List resources = Lists.newArrayList(pagedListResponse.iterateAll()); Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getErrorEventsList().get(0), resources.get(0)); diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java index e2a15746fcf0..ebeaee3d03db 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java @@ -20,7 +20,7 @@ import com.google.cloud.AsyncPage; import com.google.cloud.MonitoredResource; import com.google.cloud.MonitoredResourceDescriptor; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import com.google.cloud.Service; import com.google.common.collect.ImmutableMap; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java index 0f427ec6d640..7a1b1986a741 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java @@ -33,7 +33,7 @@ import com.google.cloud.BaseService; import com.google.cloud.MonitoredResource; import com.google.cloud.MonitoredResourceDescriptor; -import com.google.cloud.Page; +import com.google.api.gax.core.Page; import com.google.cloud.PageImpl; import com.google.cloud.logging.spi.v2.LoggingRpc; import com.google.common.base.Function; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigClient.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigClient.java index 4ca4168a1d0c..11f1e72a5d4e 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigClient.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigClient.java @@ -176,7 +176,7 @@ public final ConfigSettings getSettings() { * 

    * try (ConfigClient configClient = ConfigClient.create()) {
    *   ParentNameOneof parent = ParentNameOneof.from(ProjectName.create("[PROJECT]"));
-   *   for (LogSink element : configClient.listSinks(parent).iterateAllElements()) {
+   *   for (LogSink element : configClient.listSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -205,7 +205,7 @@ public final ListSinksPagedResponse listSinks(ParentNameOneof parent) {
    *   ListSinksRequest request = ListSinksRequest.newBuilder()
    *     .setParentWithParentNameOneof(parent)
    *     .build();
-   *   for (LogSink element : configClient.listSinks(request).iterateAllElements()) {
+   *   for (LogSink element : configClient.listSinks(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -232,7 +232,7 @@ public final ListSinksPagedResponse listSinks(ListSinksRequest request) {
    *     .build();
    *   ApiFuture<ListSinksPagedResponse> future = configClient.listSinksPagedCallable().futureCall(request);
    *   // Do something
-   *   for (LogSink element : future.get().iterateAllElements()) {
+   *   for (LogSink element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java
index d6d78fc1dc6c..8d49a36a0954 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java
@@ -17,6 +17,7 @@
 
 import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListSinksPagedResponse;
 
+import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.PropertiesProvider;
 import com.google.api.gax.core.RetrySettings;
@@ -26,6 +27,7 @@
 import com.google.api.gax.grpc.ExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingChannelProvider;
 import com.google.api.gax.grpc.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.PageContext;
 import com.google.api.gax.grpc.PagedCallSettings;
 import com.google.api.gax.grpc.PagedListDescriptor;
 import com.google.api.gax.grpc.PagedListResponseFactory;
@@ -210,13 +212,13 @@ private ConfigSettings(Builder settingsBuilder) throws IOException {
       LIST_SINKS_PAGE_STR_DESC =
           new PagedListDescriptor() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
-            public ListSinksRequest injectToken(ListSinksRequest payload, Object token) {
-              return ListSinksRequest.newBuilder(payload).setPageToken((String) token).build();
+            public ListSinksRequest injectToken(ListSinksRequest payload, String token) {
+              return ListSinksRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -230,7 +232,7 @@ public Integer extractPageSize(ListSinksRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListSinksResponse payload) {
+            public String extractNextToken(ListSinksResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -246,12 +248,14 @@ public Iterable extractResources(ListSinksResponse payload) {
           new PagedListResponseFactory<
               ListSinksRequest, ListSinksResponse, ListSinksPagedResponse>() {
             @Override
-            public ListSinksPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListSinksRequest request,
-                CallContext context) {
-              return new ListSinksPagedResponse(
-                  callable, LIST_SINKS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_SINKS_PAGE_STR_DESC, request, context);
+              return ListSinksPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingClient.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingClient.java
index 652b5084353d..96d653e2da63 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingClient.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingClient.java
@@ -382,7 +382,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *   List<String> resourceNames = new ArrayList<>();
    *   String filter = "";
    *   String orderBy = "";
-   *   for (LogEntry element : loggingClient.listLogEntries(resourceNames, filter, orderBy).iterateAllElements()) {
+   *   for (LogEntry element : loggingClient.listLogEntries(resourceNames, filter, orderBy).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -430,7 +430,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *   ListLogEntriesRequest request = ListLogEntriesRequest.newBuilder()
    *     .addAllResourceNames(resourceNames)
    *     .build();
-   *   for (LogEntry element : loggingClient.listLogEntries(request).iterateAllElements()) {
+   *   for (LogEntry element : loggingClient.listLogEntries(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -458,7 +458,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *     .build();
    *   ApiFuture<ListLogEntriesPagedResponse> future = loggingClient.listLogEntriesPagedCallable().futureCall(request);
    *   // Do something
-   *   for (LogEntry element : future.get().iterateAllElements()) {
+   *   for (LogEntry element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -511,7 +511,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    * 

    * try (LoggingClient loggingClient = LoggingClient.create()) {
    *   ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest.newBuilder().build();
-   *   for (MonitoredResourceDescriptor element : loggingClient.listMonitoredResourceDescriptors(request).iterateAllElements()) {
+   *   for (MonitoredResourceDescriptor element : loggingClient.listMonitoredResourceDescriptors(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -536,7 +536,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *   ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest.newBuilder().build();
    *   ApiFuture<ListMonitoredResourceDescriptorsPagedResponse> future = loggingClient.listMonitoredResourceDescriptorsPagedCallable().futureCall(request);
    *   // Do something
-   *   for (MonitoredResourceDescriptor element : future.get().iterateAllElements()) {
+   *   for (MonitoredResourceDescriptor element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -588,7 +588,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    * 

    * try (LoggingClient loggingClient = LoggingClient.create()) {
    *   ParentNameOneof parent = ParentNameOneof.from(ProjectName.create("[PROJECT]"));
-   *   for (String element : loggingClient.listLogs(parent).iterateAllElements()) {
+   *   for (String element : loggingClient.listLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -618,7 +618,7 @@ public final ListLogsPagedResponse listLogs(ParentNameOneof parent) {
    *   ListLogsRequest request = ListLogsRequest.newBuilder()
    *     .setParentWithParentNameOneof(parent)
    *     .build();
-   *   for (String element : loggingClient.listLogs(request).iterateAllElements()) {
+   *   for (String element : loggingClient.listLogs(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -646,7 +646,7 @@ public final ListLogsPagedResponse listLogs(ListLogsRequest request) {
    *     .build();
    *   ApiFuture<ListLogsPagedResponse> future = loggingClient.listLogsPagedCallable().futureCall(request);
    *   // Do something
-   *   for (String element : future.get().iterateAllElements()) {
+   *   for (String element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
index 08f309435aba..a94700ff2e66 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
@@ -22,6 +22,7 @@
 import com.google.api.MonitoredResourceDescriptor;
 import com.google.api.gax.batching.BatchingSettings;
 import com.google.api.gax.batching.RequestBuilder;
+import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.FlowControlSettings;
 import com.google.api.gax.core.FlowController.LimitExceededBehavior;
 import com.google.api.gax.core.GoogleCredentialsProvider;
@@ -36,6 +37,7 @@
 import com.google.api.gax.grpc.ExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingChannelProvider;
 import com.google.api.gax.grpc.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.PageContext;
 import com.google.api.gax.grpc.PagedCallSettings;
 import com.google.api.gax.grpc.PagedListDescriptor;
 import com.google.api.gax.grpc.PagedListResponseFactory;
@@ -237,13 +239,13 @@ private LoggingSettings(Builder settingsBuilder) throws IOException {
       LIST_LOG_ENTRIES_PAGE_STR_DESC =
           new PagedListDescriptor() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
-            public ListLogEntriesRequest injectToken(ListLogEntriesRequest payload, Object token) {
-              return ListLogEntriesRequest.newBuilder(payload).setPageToken((String) token).build();
+            public ListLogEntriesRequest injectToken(ListLogEntriesRequest payload, String token) {
+              return ListLogEntriesRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -258,7 +260,7 @@ public Integer extractPageSize(ListLogEntriesRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListLogEntriesResponse payload) {
+            public String extractNextToken(ListLogEntriesResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -276,15 +278,15 @@ public Iterable extractResources(ListLogEntriesResponse payload) {
               ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
               MonitoredResourceDescriptor>() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
             public ListMonitoredResourceDescriptorsRequest injectToken(
-                ListMonitoredResourceDescriptorsRequest payload, Object token) {
+                ListMonitoredResourceDescriptorsRequest payload, String token) {
               return ListMonitoredResourceDescriptorsRequest.newBuilder(payload)
-                  .setPageToken((String) token)
+                  .setPageToken(token)
                   .build();
             }
 
@@ -302,7 +304,7 @@ public Integer extractPageSize(ListMonitoredResourceDescriptorsRequest payload)
             }
 
             @Override
-            public Object extractNextToken(ListMonitoredResourceDescriptorsResponse payload) {
+            public String extractNextToken(ListMonitoredResourceDescriptorsResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -317,13 +319,13 @@ public Iterable extractResources(
       LIST_LOGS_PAGE_STR_DESC =
           new PagedListDescriptor() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
-            public ListLogsRequest injectToken(ListLogsRequest payload, Object token) {
-              return ListLogsRequest.newBuilder(payload).setPageToken((String) token).build();
+            public ListLogsRequest injectToken(ListLogsRequest payload, String token) {
+              return ListLogsRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -337,7 +339,7 @@ public Integer extractPageSize(ListLogsRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListLogsResponse payload) {
+            public String extractNextToken(ListLogsResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -353,12 +355,14 @@ public Iterable extractResources(ListLogsResponse payload) {
           new PagedListResponseFactory<
               ListLogEntriesRequest, ListLogEntriesResponse, ListLogEntriesPagedResponse>() {
             @Override
-            public ListLogEntriesPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListLogEntriesRequest request,
-                CallContext context) {
-              return new ListLogEntriesPagedResponse(
-                  callable, LIST_LOG_ENTRIES_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_LOG_ENTRIES_PAGE_STR_DESC, request, context);
+              return ListLogEntriesPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
@@ -370,15 +374,25 @@ public ListLogEntriesPagedResponse createPagedListResponse(
               ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
               ListMonitoredResourceDescriptorsPagedResponse>() {
             @Override
-            public ListMonitoredResourceDescriptorsPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable<
                         ListMonitoredResourceDescriptorsRequest,
                         ListMonitoredResourceDescriptorsResponse>
                     callable,
                 ListMonitoredResourceDescriptorsRequest request,
-                CallContext context) {
-              return new ListMonitoredResourceDescriptorsPagedResponse(
-                  callable, LIST_MONITORED_RESOURCE_DESCRIPTORS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext<
+                      ListMonitoredResourceDescriptorsRequest,
+                      ListMonitoredResourceDescriptorsResponse, MonitoredResourceDescriptor>
+                  pageContext =
+                      PageContext.create(
+                          callable,
+                          LIST_MONITORED_RESOURCE_DESCRIPTORS_PAGE_STR_DESC,
+                          request,
+                          context);
+              return ListMonitoredResourceDescriptorsPagedResponse.createAsync(
+                  pageContext, futureResponse);
             }
           };
 
@@ -387,11 +401,14 @@ public ListMonitoredResourceDescriptorsPagedResponse createPagedListResponse(
       LIST_LOGS_PAGE_STR_FACT =
           new PagedListResponseFactory() {
             @Override
-            public ListLogsPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListLogsRequest request,
-                CallContext context) {
-              return new ListLogsPagedResponse(callable, LIST_LOGS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_LOGS_PAGE_STR_DESC, request, context);
+              return ListLogsPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsClient.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsClient.java
index e76ab3eb110d..d3612292c905 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsClient.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsClient.java
@@ -177,7 +177,7 @@ public final MetricsSettings getSettings() {
    * 

    * try (MetricsClient metricsClient = MetricsClient.create()) {
    *   ParentNameOneof parent = ParentNameOneof.from(ProjectName.create("[PROJECT]"));
-   *   for (LogMetric element : metricsClient.listLogMetrics(parent).iterateAllElements()) {
+   *   for (LogMetric element : metricsClient.listLogMetrics(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -205,7 +205,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ParentNameOneof parent)
    *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder()
    *     .setParentWithParentNameOneof(parent)
    *     .build();
-   *   for (LogMetric element : metricsClient.listLogMetrics(request).iterateAllElements()) {
+   *   for (LogMetric element : metricsClient.listLogMetrics(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -232,7 +232,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re
    *     .build();
    *   ApiFuture<ListLogMetricsPagedResponse> future = metricsClient.listLogMetricsPagedCallable().futureCall(request);
    *   // Do something
-   *   for (LogMetric element : future.get().iterateAllElements()) {
+   *   for (LogMetric element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java
index a64d4b83f699..869727263628 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java
@@ -17,6 +17,7 @@
 
 import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogMetricsPagedResponse;
 
+import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.PropertiesProvider;
 import com.google.api.gax.core.RetrySettings;
@@ -26,6 +27,7 @@
 import com.google.api.gax.grpc.ExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingChannelProvider;
 import com.google.api.gax.grpc.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.PageContext;
 import com.google.api.gax.grpc.PagedCallSettings;
 import com.google.api.gax.grpc.PagedListDescriptor;
 import com.google.api.gax.grpc.PagedListResponseFactory;
@@ -212,13 +214,13 @@ private MetricsSettings(Builder settingsBuilder) throws IOException {
       LIST_LOG_METRICS_PAGE_STR_DESC =
           new PagedListDescriptor() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
-            public ListLogMetricsRequest injectToken(ListLogMetricsRequest payload, Object token) {
-              return ListLogMetricsRequest.newBuilder(payload).setPageToken((String) token).build();
+            public ListLogMetricsRequest injectToken(ListLogMetricsRequest payload, String token) {
+              return ListLogMetricsRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -233,7 +235,7 @@ public Integer extractPageSize(ListLogMetricsRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListLogMetricsResponse payload) {
+            public String extractNextToken(ListLogMetricsResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -249,12 +251,14 @@ public Iterable extractResources(ListLogMetricsResponse payload) {
           new PagedListResponseFactory<
               ListLogMetricsRequest, ListLogMetricsResponse, ListLogMetricsPagedResponse>() {
             @Override
-            public ListLogMetricsPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListLogMetricsRequest request,
-                CallContext context) {
-              return new ListLogMetricsPagedResponse(
-                  callable, LIST_LOG_METRICS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_LOG_METRICS_PAGE_STR_DESC, request, context);
+              return ListLogMetricsPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/PagedResponseWrappers.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/PagedResponseWrappers.java
index 061da4e7b6fa..29cb0798f684 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/PagedResponseWrappers.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/PagedResponseWrappers.java
@@ -16,10 +16,13 @@
 package com.google.cloud.logging.spi.v2;
 
 import com.google.api.MonitoredResourceDescriptor;
-import com.google.api.gax.grpc.CallContext;
-import com.google.api.gax.grpc.PagedListDescriptor;
-import com.google.api.gax.grpc.PagedListResponseImpl;
-import com.google.api.gax.grpc.UnaryCallable;
+import com.google.api.gax.core.ApiFunction;
+import com.google.api.gax.core.ApiFuture;
+import com.google.api.gax.core.ApiFutures;
+import com.google.api.gax.grpc.AbstractFixedSizeCollection;
+import com.google.api.gax.grpc.AbstractPage;
+import com.google.api.gax.grpc.AbstractPagedListResponse;
+import com.google.api.gax.grpc.PageContext;
 import com.google.logging.v2.ListLogEntriesRequest;
 import com.google.logging.v2.ListLogEntriesResponse;
 import com.google.logging.v2.ListLogMetricsRequest;
@@ -34,6 +37,7 @@
 import com.google.logging.v2.LogMetric;
 import com.google.logging.v2.LogSink;
 import com.google.protobuf.ExperimentalApi;
+import java.util.List;
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
@@ -47,70 +51,387 @@
 public class PagedResponseWrappers {
 
   public static class ListLogEntriesPagedResponse
-      extends PagedListResponseImpl {
+      extends AbstractPagedListResponse<
+          ListLogEntriesRequest, ListLogEntriesResponse, LogEntry, ListLogEntriesPage,
+          ListLogEntriesFixedSizeCollection> {
 
-    public ListLogEntriesPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor pageDescriptor,
-        ListLogEntriesRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListLogEntriesPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListLogEntriesPagedResponse apply(ListLogEntriesPage input) {
+              return new ListLogEntriesPagedResponse(input);
+            }
+          });
+    }
+
+    private ListLogEntriesPagedResponse(ListLogEntriesPage page) {
+      super(page, ListLogEntriesFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListLogEntriesPage
+      extends AbstractPage<
+          ListLogEntriesRequest, ListLogEntriesResponse, LogEntry, ListLogEntriesPage> {
+
+    private ListLogEntriesPage(
+        PageContext context,
+        ListLogEntriesResponse response) {
+      super(context, response);
+    }
+
+    private static ListLogEntriesPage createEmptyPage() {
+      return new ListLogEntriesPage(null, null);
+    }
+
+    @Override
+    protected ListLogEntriesPage createPage(
+        PageContext context,
+        ListLogEntriesResponse response) {
+      return new ListLogEntriesPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListLogEntriesFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListLogEntriesRequest, ListLogEntriesResponse, LogEntry, ListLogEntriesPage,
+          ListLogEntriesFixedSizeCollection> {
+
+    private ListLogEntriesFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListLogEntriesFixedSizeCollection createEmptyCollection() {
+      return new ListLogEntriesFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListLogEntriesFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListLogEntriesFixedSizeCollection(pages, collectionSize);
     }
   }
 
   public static class ListMonitoredResourceDescriptorsPagedResponse
-      extends PagedListResponseImpl<
+      extends AbstractPagedListResponse<
           ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
-          MonitoredResourceDescriptor> {
+          MonitoredResourceDescriptor, ListMonitoredResourceDescriptorsPage,
+          ListMonitoredResourceDescriptorsFixedSizeCollection> {
 
-    public ListMonitoredResourceDescriptorsPagedResponse(
-        UnaryCallable<
-                ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse>
-            callable,
-        PagedListDescriptor<
+    public static ApiFuture createAsync(
+        PageContext<
                 ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
                 MonitoredResourceDescriptor>
-            pageDescriptor,
-        ListMonitoredResourceDescriptorsRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+            context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListMonitoredResourceDescriptorsPage.createEmptyPage()
+              .createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction<
+              ListMonitoredResourceDescriptorsPage,
+              ListMonitoredResourceDescriptorsPagedResponse>() {
+            @Override
+            public ListMonitoredResourceDescriptorsPagedResponse apply(
+                ListMonitoredResourceDescriptorsPage input) {
+              return new ListMonitoredResourceDescriptorsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListMonitoredResourceDescriptorsPagedResponse(
+        ListMonitoredResourceDescriptorsPage page) {
+      super(page, ListMonitoredResourceDescriptorsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListMonitoredResourceDescriptorsPage
+      extends AbstractPage<
+          ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
+          MonitoredResourceDescriptor, ListMonitoredResourceDescriptorsPage> {
+
+    private ListMonitoredResourceDescriptorsPage(
+        PageContext<
+                ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
+                MonitoredResourceDescriptor>
+            context,
+        ListMonitoredResourceDescriptorsResponse response) {
+      super(context, response);
+    }
+
+    private static ListMonitoredResourceDescriptorsPage createEmptyPage() {
+      return new ListMonitoredResourceDescriptorsPage(null, null);
+    }
+
+    @Override
+    protected ListMonitoredResourceDescriptorsPage createPage(
+        PageContext<
+                ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
+                MonitoredResourceDescriptor>
+            context,
+        ListMonitoredResourceDescriptorsResponse response) {
+      return new ListMonitoredResourceDescriptorsPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext<
+                ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
+                MonitoredResourceDescriptor>
+            context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListMonitoredResourceDescriptorsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
+          MonitoredResourceDescriptor, ListMonitoredResourceDescriptorsPage,
+          ListMonitoredResourceDescriptorsFixedSizeCollection> {
+
+    private ListMonitoredResourceDescriptorsFixedSizeCollection(
+        List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListMonitoredResourceDescriptorsFixedSizeCollection createEmptyCollection() {
+      return new ListMonitoredResourceDescriptorsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListMonitoredResourceDescriptorsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListMonitoredResourceDescriptorsFixedSizeCollection(pages, collectionSize);
     }
   }
 
   public static class ListLogsPagedResponse
-      extends PagedListResponseImpl {
+      extends AbstractPagedListResponse<
+          ListLogsRequest, ListLogsResponse, String, ListLogsPage, ListLogsFixedSizeCollection> {
 
-    public ListLogsPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor pageDescriptor,
-        ListLogsRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListLogsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListLogsPagedResponse apply(ListLogsPage input) {
+              return new ListLogsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListLogsPagedResponse(ListLogsPage page) {
+      super(page, ListLogsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListLogsPage
+      extends AbstractPage {
+
+    private ListLogsPage(
+        PageContext context, ListLogsResponse response) {
+      super(context, response);
+    }
+
+    private static ListLogsPage createEmptyPage() {
+      return new ListLogsPage(null, null);
+    }
+
+    @Override
+    protected ListLogsPage createPage(
+        PageContext context, ListLogsResponse response) {
+      return new ListLogsPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListLogsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListLogsRequest, ListLogsResponse, String, ListLogsPage, ListLogsFixedSizeCollection> {
+
+    private ListLogsFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListLogsFixedSizeCollection createEmptyCollection() {
+      return new ListLogsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListLogsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListLogsFixedSizeCollection(pages, collectionSize);
     }
   }
 
   public static class ListSinksPagedResponse
-      extends PagedListResponseImpl {
+      extends AbstractPagedListResponse<
+          ListSinksRequest, ListSinksResponse, LogSink, ListSinksPage,
+          ListSinksFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListSinksPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListSinksPagedResponse apply(ListSinksPage input) {
+              return new ListSinksPagedResponse(input);
+            }
+          });
+    }
+
+    private ListSinksPagedResponse(ListSinksPage page) {
+      super(page, ListSinksFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListSinksPage
+      extends AbstractPage {
+
+    private ListSinksPage(
+        PageContext context,
+        ListSinksResponse response) {
+      super(context, response);
+    }
+
+    private static ListSinksPage createEmptyPage() {
+      return new ListSinksPage(null, null);
+    }
+
+    @Override
+    protected ListSinksPage createPage(
+        PageContext context,
+        ListSinksResponse response) {
+      return new ListSinksPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListSinksFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListSinksRequest, ListSinksResponse, LogSink, ListSinksPage,
+          ListSinksFixedSizeCollection> {
+
+    private ListSinksFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
 
-    public ListSinksPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor pageDescriptor,
-        ListSinksRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+    private static ListSinksFixedSizeCollection createEmptyCollection() {
+      return new ListSinksFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListSinksFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListSinksFixedSizeCollection(pages, collectionSize);
     }
   }
 
   public static class ListLogMetricsPagedResponse
-      extends PagedListResponseImpl {
-
-    public ListLogMetricsPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor
-            pageDescriptor,
-        ListLogMetricsRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+      extends AbstractPagedListResponse<
+          ListLogMetricsRequest, ListLogMetricsResponse, LogMetric, ListLogMetricsPage,
+          ListLogMetricsFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListLogMetricsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListLogMetricsPagedResponse apply(ListLogMetricsPage input) {
+              return new ListLogMetricsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListLogMetricsPagedResponse(ListLogMetricsPage page) {
+      super(page, ListLogMetricsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListLogMetricsPage
+      extends AbstractPage<
+          ListLogMetricsRequest, ListLogMetricsResponse, LogMetric, ListLogMetricsPage> {
+
+    private ListLogMetricsPage(
+        PageContext context,
+        ListLogMetricsResponse response) {
+      super(context, response);
+    }
+
+    private static ListLogMetricsPage createEmptyPage() {
+      return new ListLogMetricsPage(null, null);
+    }
+
+    @Override
+    protected ListLogMetricsPage createPage(
+        PageContext context,
+        ListLogMetricsResponse response) {
+      return new ListLogMetricsPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListLogMetricsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListLogMetricsRequest, ListLogMetricsResponse, LogMetric, ListLogMetricsPage,
+          ListLogMetricsFixedSizeCollection> {
+
+    private ListLogMetricsFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListLogMetricsFixedSizeCollection createEmptyCollection() {
+      return new ListLogMetricsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListLogMetricsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListLogMetricsFixedSizeCollection(pages, collectionSize);
     }
   }
 }
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/ConfigClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/ConfigClientTest.java
index 8d9bbcef1888..377901cfe6c1 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/ConfigClientTest.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/ConfigClientTest.java
@@ -102,7 +102,7 @@ public void listSinksTest() {
 
     ListSinksPagedResponse pagedListResponse = client.listSinks(parent);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getSinksList().get(0), resources.get(0));
 
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingClientTest.java
index 639ba66957a7..ea4b9c0e91c4 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingClientTest.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingClientTest.java
@@ -190,7 +190,7 @@ public void listLogEntriesTest() {
     ListLogEntriesPagedResponse pagedListResponse =
         client.listLogEntries(resourceNames, filter, orderBy);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getEntriesList().get(0), resources.get(0));
 
@@ -238,7 +238,7 @@ public void listLogsTest() {
 
     ListLogsPagedResponse pagedListResponse = client.listLogs(parent);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getLogNamesList().get(0), resources.get(0));
 
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MetricsClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MetricsClientTest.java
index d8955b76f1c2..766ad0319a76 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MetricsClientTest.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MetricsClientTest.java
@@ -104,7 +104,7 @@ public void listLogMetricsTest() {
 
     ListLogMetricsPagedResponse pagedListResponse = client.listLogMetrics(parent);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getMetricsList().get(0), resources.get(0));
 
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceClient.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceClient.java
index b024c9e8cdf3..613f88fe3815 100644
--- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceClient.java
+++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceClient.java
@@ -201,7 +201,7 @@ public final GroupServiceSettings getSettings() {
    *   ListGroupsRequest request = ListGroupsRequest.newBuilder()
    *     .setNameWithProjectName(name)
    *     .build();
-   *   for (Group element : groupServiceClient.listGroups(request).iterateAllElements()) {
+   *   for (Group element : groupServiceClient.listGroups(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -228,7 +228,7 @@ public final ListGroupsPagedResponse listGroups(ListGroupsRequest request) {
    *     .build();
    *   ApiFuture<ListGroupsPagedResponse> future = groupServiceClient.listGroupsPagedCallable().futureCall(request);
    *   // Do something
-   *   for (Group element : future.get().iterateAllElements()) {
+   *   for (Group element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -558,7 +558,7 @@ public final UnaryCallable deleteGroupCallable() {
    * 

    * try (GroupServiceClient groupServiceClient = GroupServiceClient.create()) {
    *   GroupName name = GroupName.create("[PROJECT]", "[GROUP]");
-   *   for (MonitoredResource element : groupServiceClient.listGroupMembers(name).iterateAllElements()) {
+   *   for (MonitoredResource element : groupServiceClient.listGroupMembers(name).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -586,7 +586,7 @@ public final ListGroupMembersPagedResponse listGroupMembers(GroupName name) {
    *   ListGroupMembersRequest request = ListGroupMembersRequest.newBuilder()
    *     .setNameWithGroupName(name)
    *     .build();
-   *   for (MonitoredResource element : groupServiceClient.listGroupMembers(request).iterateAllElements()) {
+   *   for (MonitoredResource element : groupServiceClient.listGroupMembers(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -613,7 +613,7 @@ public final ListGroupMembersPagedResponse listGroupMembers(ListGroupMembersRequ
    *     .build();
    *   ApiFuture<ListGroupMembersPagedResponse> future = groupServiceClient.listGroupMembersPagedCallable().futureCall(request);
    *   // Do something
-   *   for (MonitoredResource element : future.get().iterateAllElements()) {
+   *   for (MonitoredResource element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java
index c6fcfa942d01..abd35e784301 100644
--- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java
+++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java
@@ -19,6 +19,7 @@
 import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListGroupsPagedResponse;
 
 import com.google.api.MonitoredResource;
+import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.PropertiesProvider;
 import com.google.api.gax.core.RetrySettings;
@@ -28,6 +29,7 @@
 import com.google.api.gax.grpc.ExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingChannelProvider;
 import com.google.api.gax.grpc.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.PageContext;
 import com.google.api.gax.grpc.PagedCallSettings;
 import com.google.api.gax.grpc.PagedListDescriptor;
 import com.google.api.gax.grpc.PagedListResponseFactory;
@@ -225,13 +227,13 @@ private GroupServiceSettings(Builder settingsBuilder) throws IOException {
       LIST_GROUPS_PAGE_STR_DESC =
           new PagedListDescriptor() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
-            public ListGroupsRequest injectToken(ListGroupsRequest payload, Object token) {
-              return ListGroupsRequest.newBuilder(payload).setPageToken((String) token).build();
+            public ListGroupsRequest injectToken(ListGroupsRequest payload, String token) {
+              return ListGroupsRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -245,7 +247,7 @@ public Integer extractPageSize(ListGroupsRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListGroupsResponse payload) {
+            public String extractNextToken(ListGroupsResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -261,16 +263,14 @@ public Iterable extractResources(ListGroupsResponse payload) {
           new PagedListDescriptor<
               ListGroupMembersRequest, ListGroupMembersResponse, MonitoredResource>() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
             public ListGroupMembersRequest injectToken(
-                ListGroupMembersRequest payload, Object token) {
-              return ListGroupMembersRequest.newBuilder(payload)
-                  .setPageToken((String) token)
-                  .build();
+                ListGroupMembersRequest payload, String token) {
+              return ListGroupMembersRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -285,7 +285,7 @@ public Integer extractPageSize(ListGroupMembersRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListGroupMembersResponse payload) {
+            public String extractNextToken(ListGroupMembersResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -301,12 +301,14 @@ public Iterable extractResources(ListGroupMembersResponse pay
           new PagedListResponseFactory<
               ListGroupsRequest, ListGroupsResponse, ListGroupsPagedResponse>() {
             @Override
-            public ListGroupsPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListGroupsRequest request,
-                CallContext context) {
-              return new ListGroupsPagedResponse(
-                  callable, LIST_GROUPS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_GROUPS_PAGE_STR_DESC, request, context);
+              return ListGroupsPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
@@ -316,12 +318,16 @@ public ListGroupsPagedResponse createPagedListResponse(
           new PagedListResponseFactory<
               ListGroupMembersRequest, ListGroupMembersResponse, ListGroupMembersPagedResponse>() {
             @Override
-            public ListGroupMembersPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListGroupMembersRequest request,
-                CallContext context) {
-              return new ListGroupMembersPagedResponse(
-                  callable, LIST_GROUP_MEMBERS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext
+                  pageContext =
+                      PageContext.create(
+                          callable, LIST_GROUP_MEMBERS_PAGE_STR_DESC, request, context);
+              return ListGroupMembersPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java
index c52a521ed660..312304ebcbdf 100644
--- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java
+++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java
@@ -224,7 +224,7 @@ public final MetricServiceSettings getSettings() {
    * 

    * try (MetricServiceClient metricServiceClient = MetricServiceClient.create()) {
    *   ProjectName name = ProjectName.create("[PROJECT]");
-   *   for (MonitoredResourceDescriptor element : metricServiceClient.listMonitoredResourceDescriptors(name).iterateAllElements()) {
+   *   for (MonitoredResourceDescriptor element : metricServiceClient.listMonitoredResourceDescriptors(name).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -254,7 +254,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *   ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest.newBuilder()
    *     .setNameWithProjectName(name)
    *     .build();
-   *   for (MonitoredResourceDescriptor element : metricServiceClient.listMonitoredResourceDescriptors(request).iterateAllElements()) {
+   *   for (MonitoredResourceDescriptor element : metricServiceClient.listMonitoredResourceDescriptors(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -283,7 +283,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *     .build();
    *   ApiFuture<ListMonitoredResourceDescriptorsPagedResponse> future = metricServiceClient.listMonitoredResourceDescriptorsPagedCallable().futureCall(request);
    *   // Do something
-   *   for (MonitoredResourceDescriptor element : future.get().iterateAllElements()) {
+   *   for (MonitoredResourceDescriptor element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -417,7 +417,7 @@ private final MonitoredResourceDescriptor getMonitoredResourceDescriptor(
    * 

    * try (MetricServiceClient metricServiceClient = MetricServiceClient.create()) {
    *   ProjectName name = ProjectName.create("[PROJECT]");
-   *   for (MetricDescriptor element : metricServiceClient.listMetricDescriptors(name).iterateAllElements()) {
+   *   for (MetricDescriptor element : metricServiceClient.listMetricDescriptors(name).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -446,7 +446,7 @@ public final ListMetricDescriptorsPagedResponse listMetricDescriptors(ProjectNam
    *   ListMetricDescriptorsRequest request = ListMetricDescriptorsRequest.newBuilder()
    *     .setNameWithProjectName(name)
    *     .build();
-   *   for (MetricDescriptor element : metricServiceClient.listMetricDescriptors(request).iterateAllElements()) {
+   *   for (MetricDescriptor element : metricServiceClient.listMetricDescriptors(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -475,7 +475,7 @@ public final ListMetricDescriptorsPagedResponse listMetricDescriptors(
    *     .build();
    *   ApiFuture<ListMetricDescriptorsPagedResponse> future = metricServiceClient.listMetricDescriptorsPagedCallable().futureCall(request);
    *   // Do something
-   *   for (MetricDescriptor element : future.get().iterateAllElements()) {
+   *   for (MetricDescriptor element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -759,7 +759,7 @@ private final void deleteMetricDescriptor(DeleteMetricDescriptorRequest request)
    *   String filter = "";
    *   TimeInterval interval = TimeInterval.newBuilder().build();
    *   ListTimeSeriesRequest.TimeSeriesView view = ListTimeSeriesRequest.TimeSeriesView.FULL;
-   *   for (TimeSeries element : metricServiceClient.listTimeSeries(name, filter, interval, view).iterateAllElements()) {
+   *   for (TimeSeries element : metricServiceClient.listTimeSeries(name, filter, interval, view).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -810,7 +810,7 @@ public final ListTimeSeriesPagedResponse listTimeSeries(
    *     .setInterval(interval)
    *     .setView(view)
    *     .build();
-   *   for (TimeSeries element : metricServiceClient.listTimeSeries(request).iterateAllElements()) {
+   *   for (TimeSeries element : metricServiceClient.listTimeSeries(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -843,7 +843,7 @@ public final ListTimeSeriesPagedResponse listTimeSeries(ListTimeSeriesRequest re
    *     .build();
    *   ApiFuture<ListTimeSeriesPagedResponse> future = metricServiceClient.listTimeSeriesPagedCallable().futureCall(request);
    *   // Do something
-   *   for (TimeSeries element : future.get().iterateAllElements()) {
+   *   for (TimeSeries element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java
index 8972afdf9458..12a648050d4a 100644
--- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java
+++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java
@@ -21,6 +21,7 @@
 
 import com.google.api.MetricDescriptor;
 import com.google.api.MonitoredResourceDescriptor;
+import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.PropertiesProvider;
 import com.google.api.gax.core.RetrySettings;
@@ -30,6 +31,7 @@
 import com.google.api.gax.grpc.ExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingChannelProvider;
 import com.google.api.gax.grpc.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.PageContext;
 import com.google.api.gax.grpc.PagedCallSettings;
 import com.google.api.gax.grpc.PagedListDescriptor;
 import com.google.api.gax.grpc.PagedListResponseFactory;
@@ -268,15 +270,15 @@ private MetricServiceSettings(Builder settingsBuilder) throws IOException {
               ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
               MonitoredResourceDescriptor>() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
             public ListMonitoredResourceDescriptorsRequest injectToken(
-                ListMonitoredResourceDescriptorsRequest payload, Object token) {
+                ListMonitoredResourceDescriptorsRequest payload, String token) {
               return ListMonitoredResourceDescriptorsRequest.newBuilder(payload)
-                  .setPageToken((String) token)
+                  .setPageToken(token)
                   .build();
             }
 
@@ -294,7 +296,7 @@ public Integer extractPageSize(ListMonitoredResourceDescriptorsRequest payload)
             }
 
             @Override
-            public Object extractNextToken(ListMonitoredResourceDescriptorsResponse payload) {
+            public String extractNextToken(ListMonitoredResourceDescriptorsResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -311,16 +313,14 @@ public Iterable extractResources(
           new PagedListDescriptor<
               ListMetricDescriptorsRequest, ListMetricDescriptorsResponse, MetricDescriptor>() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
             public ListMetricDescriptorsRequest injectToken(
-                ListMetricDescriptorsRequest payload, Object token) {
-              return ListMetricDescriptorsRequest.newBuilder(payload)
-                  .setPageToken((String) token)
-                  .build();
+                ListMetricDescriptorsRequest payload, String token) {
+              return ListMetricDescriptorsRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -335,7 +335,7 @@ public Integer extractPageSize(ListMetricDescriptorsRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListMetricDescriptorsResponse payload) {
+            public String extractNextToken(ListMetricDescriptorsResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -351,13 +351,13 @@ public Iterable extractResources(
       LIST_TIME_SERIES_PAGE_STR_DESC =
           new PagedListDescriptor() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
-            public ListTimeSeriesRequest injectToken(ListTimeSeriesRequest payload, Object token) {
-              return ListTimeSeriesRequest.newBuilder(payload).setPageToken((String) token).build();
+            public ListTimeSeriesRequest injectToken(ListTimeSeriesRequest payload, String token) {
+              return ListTimeSeriesRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -372,7 +372,7 @@ public Integer extractPageSize(ListTimeSeriesRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListTimeSeriesResponse payload) {
+            public String extractNextToken(ListTimeSeriesResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -390,15 +390,25 @@ public Iterable extractResources(ListTimeSeriesResponse payload) {
               ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
               ListMonitoredResourceDescriptorsPagedResponse>() {
             @Override
-            public ListMonitoredResourceDescriptorsPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable<
                         ListMonitoredResourceDescriptorsRequest,
                         ListMonitoredResourceDescriptorsResponse>
                     callable,
                 ListMonitoredResourceDescriptorsRequest request,
-                CallContext context) {
-              return new ListMonitoredResourceDescriptorsPagedResponse(
-                  callable, LIST_MONITORED_RESOURCE_DESCRIPTORS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext<
+                      ListMonitoredResourceDescriptorsRequest,
+                      ListMonitoredResourceDescriptorsResponse, MonitoredResourceDescriptor>
+                  pageContext =
+                      PageContext.create(
+                          callable,
+                          LIST_MONITORED_RESOURCE_DESCRIPTORS_PAGE_STR_DESC,
+                          request,
+                          context);
+              return ListMonitoredResourceDescriptorsPagedResponse.createAsync(
+                  pageContext, futureResponse);
             }
           };
 
@@ -410,12 +420,17 @@ public ListMonitoredResourceDescriptorsPagedResponse createPagedListResponse(
               ListMetricDescriptorsRequest, ListMetricDescriptorsResponse,
               ListMetricDescriptorsPagedResponse>() {
             @Override
-            public ListMetricDescriptorsPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListMetricDescriptorsRequest request,
-                CallContext context) {
-              return new ListMetricDescriptorsPagedResponse(
-                  callable, LIST_METRIC_DESCRIPTORS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext<
+                      ListMetricDescriptorsRequest, ListMetricDescriptorsResponse, MetricDescriptor>
+                  pageContext =
+                      PageContext.create(
+                          callable, LIST_METRIC_DESCRIPTORS_PAGE_STR_DESC, request, context);
+              return ListMetricDescriptorsPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
@@ -425,12 +440,14 @@ public ListMetricDescriptorsPagedResponse createPagedListResponse(
           new PagedListResponseFactory<
               ListTimeSeriesRequest, ListTimeSeriesResponse, ListTimeSeriesPagedResponse>() {
             @Override
-            public ListTimeSeriesPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListTimeSeriesRequest request,
-                CallContext context) {
-              return new ListTimeSeriesPagedResponse(
-                  callable, LIST_TIME_SERIES_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_TIME_SERIES_PAGE_STR_DESC, request, context);
+              return ListTimeSeriesPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/PagedResponseWrappers.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/PagedResponseWrappers.java
index 83ff4f730566..822424872969 100644
--- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/PagedResponseWrappers.java
+++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/PagedResponseWrappers.java
@@ -18,10 +18,13 @@
 import com.google.api.MetricDescriptor;
 import com.google.api.MonitoredResource;
 import com.google.api.MonitoredResourceDescriptor;
-import com.google.api.gax.grpc.CallContext;
-import com.google.api.gax.grpc.PagedListDescriptor;
-import com.google.api.gax.grpc.PagedListResponseImpl;
-import com.google.api.gax.grpc.UnaryCallable;
+import com.google.api.gax.core.ApiFunction;
+import com.google.api.gax.core.ApiFuture;
+import com.google.api.gax.core.ApiFutures;
+import com.google.api.gax.grpc.AbstractFixedSizeCollection;
+import com.google.api.gax.grpc.AbstractPage;
+import com.google.api.gax.grpc.AbstractPagedListResponse;
+import com.google.api.gax.grpc.PageContext;
 import com.google.monitoring.v3.Group;
 import com.google.monitoring.v3.ListGroupMembersRequest;
 import com.google.monitoring.v3.ListGroupMembersResponse;
@@ -35,6 +38,7 @@
 import com.google.monitoring.v3.ListTimeSeriesResponse;
 import com.google.monitoring.v3.TimeSeries;
 import com.google.protobuf.ExperimentalApi;
+import java.util.List;
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
@@ -48,75 +52,400 @@
 public class PagedResponseWrappers {
 
   public static class ListGroupsPagedResponse
-      extends PagedListResponseImpl {
+      extends AbstractPagedListResponse<
+          ListGroupsRequest, ListGroupsResponse, Group, ListGroupsPage,
+          ListGroupsFixedSizeCollection> {
 
-    public ListGroupsPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor pageDescriptor,
-        ListGroupsRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListGroupsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListGroupsPagedResponse apply(ListGroupsPage input) {
+              return new ListGroupsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListGroupsPagedResponse(ListGroupsPage page) {
+      super(page, ListGroupsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListGroupsPage
+      extends AbstractPage {
+
+    private ListGroupsPage(
+        PageContext context,
+        ListGroupsResponse response) {
+      super(context, response);
+    }
+
+    private static ListGroupsPage createEmptyPage() {
+      return new ListGroupsPage(null, null);
+    }
+
+    @Override
+    protected ListGroupsPage createPage(
+        PageContext context,
+        ListGroupsResponse response) {
+      return new ListGroupsPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListGroupsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListGroupsRequest, ListGroupsResponse, Group, ListGroupsPage,
+          ListGroupsFixedSizeCollection> {
+
+    private ListGroupsFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListGroupsFixedSizeCollection createEmptyCollection() {
+      return new ListGroupsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListGroupsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListGroupsFixedSizeCollection(pages, collectionSize);
     }
   }
 
   public static class ListGroupMembersPagedResponse
-      extends PagedListResponseImpl<
-          ListGroupMembersRequest, ListGroupMembersResponse, MonitoredResource> {
+      extends AbstractPagedListResponse<
+          ListGroupMembersRequest, ListGroupMembersResponse, MonitoredResource,
+          ListGroupMembersPage, ListGroupMembersFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListGroupMembersPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListGroupMembersPagedResponse apply(ListGroupMembersPage input) {
+              return new ListGroupMembersPagedResponse(input);
+            }
+          });
+    }
 
-    public ListGroupMembersPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor
-            pageDescriptor,
-        ListGroupMembersRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+    private ListGroupMembersPagedResponse(ListGroupMembersPage page) {
+      super(page, ListGroupMembersFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListGroupMembersPage
+      extends AbstractPage<
+          ListGroupMembersRequest, ListGroupMembersResponse, MonitoredResource,
+          ListGroupMembersPage> {
+
+    private ListGroupMembersPage(
+        PageContext context,
+        ListGroupMembersResponse response) {
+      super(context, response);
+    }
+
+    private static ListGroupMembersPage createEmptyPage() {
+      return new ListGroupMembersPage(null, null);
+    }
+
+    @Override
+    protected ListGroupMembersPage createPage(
+        PageContext context,
+        ListGroupMembersResponse response) {
+      return new ListGroupMembersPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListGroupMembersFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListGroupMembersRequest, ListGroupMembersResponse, MonitoredResource,
+          ListGroupMembersPage, ListGroupMembersFixedSizeCollection> {
+
+    private ListGroupMembersFixedSizeCollection(
+        List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListGroupMembersFixedSizeCollection createEmptyCollection() {
+      return new ListGroupMembersFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListGroupMembersFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListGroupMembersFixedSizeCollection(pages, collectionSize);
     }
   }
 
   public static class ListMonitoredResourceDescriptorsPagedResponse
-      extends PagedListResponseImpl<
+      extends AbstractPagedListResponse<
           ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
-          MonitoredResourceDescriptor> {
+          MonitoredResourceDescriptor, ListMonitoredResourceDescriptorsPage,
+          ListMonitoredResourceDescriptorsFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext<
+                ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
+                MonitoredResourceDescriptor>
+            context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListMonitoredResourceDescriptorsPage.createEmptyPage()
+              .createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction<
+              ListMonitoredResourceDescriptorsPage,
+              ListMonitoredResourceDescriptorsPagedResponse>() {
+            @Override
+            public ListMonitoredResourceDescriptorsPagedResponse apply(
+                ListMonitoredResourceDescriptorsPage input) {
+              return new ListMonitoredResourceDescriptorsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListMonitoredResourceDescriptorsPagedResponse(
+        ListMonitoredResourceDescriptorsPage page) {
+      super(page, ListMonitoredResourceDescriptorsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListMonitoredResourceDescriptorsPage
+      extends AbstractPage<
+          ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
+          MonitoredResourceDescriptor, ListMonitoredResourceDescriptorsPage> {
+
+    private ListMonitoredResourceDescriptorsPage(
+        PageContext<
+                ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
+                MonitoredResourceDescriptor>
+            context,
+        ListMonitoredResourceDescriptorsResponse response) {
+      super(context, response);
+    }
+
+    private static ListMonitoredResourceDescriptorsPage createEmptyPage() {
+      return new ListMonitoredResourceDescriptorsPage(null, null);
+    }
 
-    public ListMonitoredResourceDescriptorsPagedResponse(
-        UnaryCallable<
-                ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse>
-            callable,
-        PagedListDescriptor<
+    @Override
+    protected ListMonitoredResourceDescriptorsPage createPage(
+        PageContext<
                 ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
                 MonitoredResourceDescriptor>
-            pageDescriptor,
-        ListMonitoredResourceDescriptorsRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+            context,
+        ListMonitoredResourceDescriptorsResponse response) {
+      return new ListMonitoredResourceDescriptorsPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext<
+                ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
+                MonitoredResourceDescriptor>
+            context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListMonitoredResourceDescriptorsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListMonitoredResourceDescriptorsRequest, ListMonitoredResourceDescriptorsResponse,
+          MonitoredResourceDescriptor, ListMonitoredResourceDescriptorsPage,
+          ListMonitoredResourceDescriptorsFixedSizeCollection> {
+
+    private ListMonitoredResourceDescriptorsFixedSizeCollection(
+        List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListMonitoredResourceDescriptorsFixedSizeCollection createEmptyCollection() {
+      return new ListMonitoredResourceDescriptorsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListMonitoredResourceDescriptorsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListMonitoredResourceDescriptorsFixedSizeCollection(pages, collectionSize);
     }
   }
 
   public static class ListMetricDescriptorsPagedResponse
-      extends PagedListResponseImpl<
-          ListMetricDescriptorsRequest, ListMetricDescriptorsResponse, MetricDescriptor> {
-
-    public ListMetricDescriptorsPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor<
-                ListMetricDescriptorsRequest, ListMetricDescriptorsResponse, MetricDescriptor>
-            pageDescriptor,
-        ListMetricDescriptorsRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+      extends AbstractPagedListResponse<
+          ListMetricDescriptorsRequest, ListMetricDescriptorsResponse, MetricDescriptor,
+          ListMetricDescriptorsPage, ListMetricDescriptorsFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext
+            context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListMetricDescriptorsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListMetricDescriptorsPagedResponse apply(ListMetricDescriptorsPage input) {
+              return new ListMetricDescriptorsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListMetricDescriptorsPagedResponse(ListMetricDescriptorsPage page) {
+      super(page, ListMetricDescriptorsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListMetricDescriptorsPage
+      extends AbstractPage<
+          ListMetricDescriptorsRequest, ListMetricDescriptorsResponse, MetricDescriptor,
+          ListMetricDescriptorsPage> {
+
+    private ListMetricDescriptorsPage(
+        PageContext
+            context,
+        ListMetricDescriptorsResponse response) {
+      super(context, response);
+    }
+
+    private static ListMetricDescriptorsPage createEmptyPage() {
+      return new ListMetricDescriptorsPage(null, null);
+    }
+
+    @Override
+    protected ListMetricDescriptorsPage createPage(
+        PageContext
+            context,
+        ListMetricDescriptorsResponse response) {
+      return new ListMetricDescriptorsPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext
+            context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListMetricDescriptorsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListMetricDescriptorsRequest, ListMetricDescriptorsResponse, MetricDescriptor,
+          ListMetricDescriptorsPage, ListMetricDescriptorsFixedSizeCollection> {
+
+    private ListMetricDescriptorsFixedSizeCollection(
+        List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListMetricDescriptorsFixedSizeCollection createEmptyCollection() {
+      return new ListMetricDescriptorsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListMetricDescriptorsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListMetricDescriptorsFixedSizeCollection(pages, collectionSize);
     }
   }
 
   public static class ListTimeSeriesPagedResponse
-      extends PagedListResponseImpl {
-
-    public ListTimeSeriesPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor
-            pageDescriptor,
-        ListTimeSeriesRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+      extends AbstractPagedListResponse<
+          ListTimeSeriesRequest, ListTimeSeriesResponse, TimeSeries, ListTimeSeriesPage,
+          ListTimeSeriesFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListTimeSeriesPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListTimeSeriesPagedResponse apply(ListTimeSeriesPage input) {
+              return new ListTimeSeriesPagedResponse(input);
+            }
+          });
+    }
+
+    private ListTimeSeriesPagedResponse(ListTimeSeriesPage page) {
+      super(page, ListTimeSeriesFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListTimeSeriesPage
+      extends AbstractPage<
+          ListTimeSeriesRequest, ListTimeSeriesResponse, TimeSeries, ListTimeSeriesPage> {
+
+    private ListTimeSeriesPage(
+        PageContext context,
+        ListTimeSeriesResponse response) {
+      super(context, response);
+    }
+
+    private static ListTimeSeriesPage createEmptyPage() {
+      return new ListTimeSeriesPage(null, null);
+    }
+
+    @Override
+    protected ListTimeSeriesPage createPage(
+        PageContext context,
+        ListTimeSeriesResponse response) {
+      return new ListTimeSeriesPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListTimeSeriesFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListTimeSeriesRequest, ListTimeSeriesResponse, TimeSeries, ListTimeSeriesPage,
+          ListTimeSeriesFixedSizeCollection> {
+
+    private ListTimeSeriesFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListTimeSeriesFixedSizeCollection createEmptyCollection() {
+      return new ListTimeSeriesFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListTimeSeriesFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListTimeSeriesFixedSizeCollection(pages, collectionSize);
     }
   }
 }
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/GroupServiceClientTest.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/GroupServiceClientTest.java
index e145ebba9a9a..497d4cee827f 100644
--- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/GroupServiceClientTest.java
+++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/GroupServiceClientTest.java
@@ -275,7 +275,7 @@ public void listGroupMembersTest() {
 
     ListGroupMembersPagedResponse pagedListResponse = client.listGroupMembers(name);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getMembersList().get(0), resources.get(0));
 
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java
index b6d3f705d14a..27bae083fba1 100644
--- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java
+++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java
@@ -115,7 +115,7 @@ public void listMonitoredResourceDescriptorsTest() {
         client.listMonitoredResourceDescriptors(name);
 
     List resources =
-        Lists.newArrayList(pagedListResponse.iterateAllElements());
+        Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getResourceDescriptorsList().get(0), resources.get(0));
 
@@ -207,7 +207,7 @@ public void listMetricDescriptorsTest() {
 
     ListMetricDescriptorsPagedResponse pagedListResponse = client.listMetricDescriptors(name);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getMetricDescriptorsList().get(0), resources.get(0));
 
@@ -386,7 +386,7 @@ public void listTimeSeriesTest() {
     ListTimeSeriesPagedResponse pagedListResponse =
         client.listTimeSeries(name, filter, interval, view);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getTimeSeriesList().get(0), resources.get(0));
 

From 5df801d0e80d2e5255544bf0e4eb9e996e0cd222 Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Mon, 10 Apr 2017 17:08:45 -0700
Subject: [PATCH 04/15] Pubsub, resourcemanager, spanner, storage, trace

---
 .../pubsub/spi/v1/PagedResponseWrappers.java  | 360 ++++++++++++++++--
 .../spi/v1/SubscriptionAdminClient.java       |  12 +-
 .../spi/v1/SubscriptionAdminSettings.java     |  42 +-
 .../cloud/pubsub/spi/v1/TopicAdminClient.java |   6 +-
 .../pubsub/spi/v1/TopicAdminSettings.java     |  42 +-
 .../spi/v1/SubscriptionAdminClientTest.java   |   4 +-
 .../pubsub/spi/v1/TopicAdminClientTest.java   |   4 +-
 .../resourcemanager/ResourceManager.java      |   2 +-
 .../resourcemanager/ResourceManagerImpl.java  |   2 +-
 .../cloud/spanner/DatabaseAdminClient.java    |   2 +-
 .../com/google/cloud/spanner/Instance.java    |   2 +-
 .../cloud/spanner/InstanceAdminClient.java    |   2 +-
 .../com/google/cloud/spanner/SpannerImpl.java |   2 +-
 .../java/com/google/cloud/storage/Bucket.java |   2 +-
 .../com/google/cloud/storage/Storage.java     |   2 +-
 .../com/google/cloud/storage/StorageImpl.java |   2 +-
 .../testing/RemoteStorageHelperTest.java      |  14 +-
 .../trace/spi/v1/PagedResponseWrappers.java   |  89 ++++-
 .../trace/spi/v1/TraceServiceClient.java      |   6 +-
 .../trace/spi/v1/TraceServiceSettings.java    |  20 +-
 .../trace/spi/v1/TraceServiceClientTest.java  |   2 +-
 21 files changed, 494 insertions(+), 125 deletions(-)

diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PagedResponseWrappers.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PagedResponseWrappers.java
index 09a450592ae3..ea39aeae9f91 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PagedResponseWrappers.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PagedResponseWrappers.java
@@ -15,10 +15,13 @@
  */
 package com.google.cloud.pubsub.spi.v1;
 
-import com.google.api.gax.grpc.CallContext;
-import com.google.api.gax.grpc.PagedListDescriptor;
-import com.google.api.gax.grpc.PagedListResponseImpl;
-import com.google.api.gax.grpc.UnaryCallable;
+import com.google.api.gax.core.ApiFunction;
+import com.google.api.gax.core.ApiFuture;
+import com.google.api.gax.core.ApiFutures;
+import com.google.api.gax.grpc.AbstractFixedSizeCollection;
+import com.google.api.gax.grpc.AbstractPage;
+import com.google.api.gax.grpc.AbstractPagedListResponse;
+import com.google.api.gax.grpc.PageContext;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.protobuf.ExperimentalApi;
@@ -34,6 +37,7 @@
 import com.google.pubsub.v1.Subscription;
 import com.google.pubsub.v1.SubscriptionName;
 import com.google.pubsub.v1.Topic;
+import java.util.List;
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
@@ -47,33 +51,189 @@
 public class PagedResponseWrappers {
 
   public static class ListTopicsPagedResponse
-      extends PagedListResponseImpl {
+      extends AbstractPagedListResponse<
+          ListTopicsRequest, ListTopicsResponse, Topic, ListTopicsPage,
+          ListTopicsFixedSizeCollection> {
 
-    public ListTopicsPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor pageDescriptor,
-        ListTopicsRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListTopicsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListTopicsPagedResponse apply(ListTopicsPage input) {
+              return new ListTopicsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListTopicsPagedResponse(ListTopicsPage page) {
+      super(page, ListTopicsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListTopicsPage
+      extends AbstractPage {
+
+    private ListTopicsPage(
+        PageContext context,
+        ListTopicsResponse response) {
+      super(context, response);
+    }
+
+    private static ListTopicsPage createEmptyPage() {
+      return new ListTopicsPage(null, null);
+    }
+
+    @Override
+    protected ListTopicsPage createPage(
+        PageContext context,
+        ListTopicsResponse response) {
+      return new ListTopicsPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListTopicsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListTopicsRequest, ListTopicsResponse, Topic, ListTopicsPage,
+          ListTopicsFixedSizeCollection> {
+
+    private ListTopicsFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListTopicsFixedSizeCollection createEmptyCollection() {
+      return new ListTopicsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListTopicsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListTopicsFixedSizeCollection(pages, collectionSize);
     }
   }
 
   public static class ListTopicSubscriptionsPagedResponse
-      extends PagedListResponseImpl<
-          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String> {
+      extends AbstractPagedListResponse<
+          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String,
+          ListTopicSubscriptionsPage, ListTopicSubscriptionsFixedSizeCollection> {
 
-    public ListTopicSubscriptionsPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor
-            pageDescriptor,
-        ListTopicSubscriptionsRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListTopicSubscriptionsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListTopicSubscriptionsPagedResponse apply(ListTopicSubscriptionsPage input) {
+              return new ListTopicSubscriptionsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListTopicSubscriptionsPagedResponse(ListTopicSubscriptionsPage page) {
+      super(page, ListTopicSubscriptionsFixedSizeCollection.createEmptyCollection());
     }
 
     public Iterable iterateAllAsSubscriptionName() {
       return Iterables.transform(
-          iterateAllElements(),
+          iterateAll(),
+          new Function() {
+            @Override
+            public SubscriptionName apply(String arg0) {
+              return SubscriptionName.parse(arg0);
+            }
+          });
+    }
+  }
+
+  public static class ListTopicSubscriptionsPage
+      extends AbstractPage<
+          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String,
+          ListTopicSubscriptionsPage> {
+
+    private ListTopicSubscriptionsPage(
+        PageContext context,
+        ListTopicSubscriptionsResponse response) {
+      super(context, response);
+    }
+
+    private static ListTopicSubscriptionsPage createEmptyPage() {
+      return new ListTopicSubscriptionsPage(null, null);
+    }
+
+    @Override
+    protected ListTopicSubscriptionsPage createPage(
+        PageContext context,
+        ListTopicSubscriptionsResponse response) {
+      return new ListTopicSubscriptionsPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+
+    public Iterable iterateAllAsSubscriptionName() {
+      return Iterables.transform(
+          iterateAll(),
+          new Function() {
+            @Override
+            public SubscriptionName apply(String arg0) {
+              return SubscriptionName.parse(arg0);
+            }
+          });
+    }
+
+    public Iterable getValuesAsSubscriptionName() {
+      return Iterables.transform(
+          getValues(),
+          new Function() {
+            @Override
+            public SubscriptionName apply(String arg0) {
+              return SubscriptionName.parse(arg0);
+            }
+          });
+    }
+  }
+
+  public static class ListTopicSubscriptionsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String,
+          ListTopicSubscriptionsPage, ListTopicSubscriptionsFixedSizeCollection> {
+
+    private ListTopicSubscriptionsFixedSizeCollection(
+        List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListTopicSubscriptionsFixedSizeCollection createEmptyCollection() {
+      return new ListTopicSubscriptionsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListTopicSubscriptionsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListTopicSubscriptionsFixedSizeCollection(pages, collectionSize);
+    }
+
+    public Iterable getValuesAsSubscriptionName() {
+      return Iterables.transform(
+          getValues(),
           new Function() {
             @Override
             public SubscriptionName apply(String arg0) {
@@ -84,28 +244,152 @@ public SubscriptionName apply(String arg0) {
   }
 
   public static class ListSubscriptionsPagedResponse
-      extends PagedListResponseImpl<
-          ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription> {
+      extends AbstractPagedListResponse<
+          ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription, ListSubscriptionsPage,
+          ListSubscriptionsFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListSubscriptionsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListSubscriptionsPagedResponse apply(ListSubscriptionsPage input) {
+              return new ListSubscriptionsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListSubscriptionsPagedResponse(ListSubscriptionsPage page) {
+      super(page, ListSubscriptionsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListSubscriptionsPage
+      extends AbstractPage<
+          ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription,
+          ListSubscriptionsPage> {
+
+    private ListSubscriptionsPage(
+        PageContext context,
+        ListSubscriptionsResponse response) {
+      super(context, response);
+    }
+
+    private static ListSubscriptionsPage createEmptyPage() {
+      return new ListSubscriptionsPage(null, null);
+    }
+
+    @Override
+    protected ListSubscriptionsPage createPage(
+        PageContext context,
+        ListSubscriptionsResponse response) {
+      return new ListSubscriptionsPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListSubscriptionsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription, ListSubscriptionsPage,
+          ListSubscriptionsFixedSizeCollection> {
+
+    private ListSubscriptionsFixedSizeCollection(
+        List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
 
-    public ListSubscriptionsPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor
-            pageDescriptor,
-        ListSubscriptionsRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+    private static ListSubscriptionsFixedSizeCollection createEmptyCollection() {
+      return new ListSubscriptionsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListSubscriptionsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListSubscriptionsFixedSizeCollection(pages, collectionSize);
     }
   }
 
   public static class ListSnapshotsPagedResponse
-      extends PagedListResponseImpl {
-
-    public ListSnapshotsPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor pageDescriptor,
-        ListSnapshotsRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+      extends AbstractPagedListResponse<
+          ListSnapshotsRequest, ListSnapshotsResponse, Snapshot, ListSnapshotsPage,
+          ListSnapshotsFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListSnapshotsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListSnapshotsPagedResponse apply(ListSnapshotsPage input) {
+              return new ListSnapshotsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListSnapshotsPagedResponse(ListSnapshotsPage page) {
+      super(page, ListSnapshotsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListSnapshotsPage
+      extends AbstractPage<
+          ListSnapshotsRequest, ListSnapshotsResponse, Snapshot, ListSnapshotsPage> {
+
+    private ListSnapshotsPage(
+        PageContext context,
+        ListSnapshotsResponse response) {
+      super(context, response);
+    }
+
+    private static ListSnapshotsPage createEmptyPage() {
+      return new ListSnapshotsPage(null, null);
+    }
+
+    @Override
+    protected ListSnapshotsPage createPage(
+        PageContext context,
+        ListSnapshotsResponse response) {
+      return new ListSnapshotsPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListSnapshotsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListSnapshotsRequest, ListSnapshotsResponse, Snapshot, ListSnapshotsPage,
+          ListSnapshotsFixedSizeCollection> {
+
+    private ListSnapshotsFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListSnapshotsFixedSizeCollection createEmptyCollection() {
+      return new ListSnapshotsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListSnapshotsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListSnapshotsFixedSizeCollection(pages, collectionSize);
     }
   }
 }
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClient.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClient.java
index a9dd992088cb..8b10fea6f380 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClient.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClient.java
@@ -501,7 +501,7 @@ public final UnaryCallable updateSubscr
    * 

    * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
    *   ProjectName project = ProjectName.create("[PROJECT]");
-   *   for (Subscription element : subscriptionAdminClient.listSubscriptions(project).iterateAllElements()) {
+   *   for (Subscription element : subscriptionAdminClient.listSubscriptions(project).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -529,7 +529,7 @@ public final ListSubscriptionsPagedResponse listSubscriptions(ProjectName projec
    *   ListSubscriptionsRequest request = ListSubscriptionsRequest.newBuilder()
    *     .setProjectWithProjectName(project)
    *     .build();
-   *   for (Subscription element : subscriptionAdminClient.listSubscriptions(request).iterateAllElements()) {
+   *   for (Subscription element : subscriptionAdminClient.listSubscriptions(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -556,7 +556,7 @@ public final ListSubscriptionsPagedResponse listSubscriptions(ListSubscriptionsR
    *     .build();
    *   ApiFuture<ListSubscriptionsPagedResponse> future = subscriptionAdminClient.listSubscriptionsPagedCallable().futureCall(request);
    *   // Do something
-   *   for (Subscription element : future.get().iterateAllElements()) {
+   *   for (Subscription element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1129,7 +1129,7 @@ public final UnaryCallable modifyPushConfigCalla
    * 

    * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
    *   ProjectName project = ProjectName.create("[PROJECT]");
-   *   for (Snapshot element : subscriptionAdminClient.listSnapshots(project).iterateAllElements()) {
+   *   for (Snapshot element : subscriptionAdminClient.listSnapshots(project).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1157,7 +1157,7 @@ public final ListSnapshotsPagedResponse listSnapshots(ProjectName project) {
    *   ListSnapshotsRequest request = ListSnapshotsRequest.newBuilder()
    *     .setProjectWithProjectName(project)
    *     .build();
-   *   for (Snapshot element : subscriptionAdminClient.listSnapshots(request).iterateAllElements()) {
+   *   for (Snapshot element : subscriptionAdminClient.listSnapshots(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1184,7 +1184,7 @@ public final ListSnapshotsPagedResponse listSnapshots(ListSnapshotsRequest reque
    *     .build();
    *   ApiFuture<ListSnapshotsPagedResponse> future = subscriptionAdminClient.listSnapshotsPagedCallable().futureCall(request);
    *   // Do something
-   *   for (Snapshot element : future.get().iterateAllElements()) {
+   *   for (Snapshot element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java
index 137947897358..b2b1b66a0764 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java
@@ -18,6 +18,7 @@
 import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSnapshotsPagedResponse;
 import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse;
 
+import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.PropertiesProvider;
 import com.google.api.gax.core.RetrySettings;
@@ -27,6 +28,7 @@
 import com.google.api.gax.grpc.ExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingChannelProvider;
 import com.google.api.gax.grpc.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.PageContext;
 import com.google.api.gax.grpc.PagedCallSettings;
 import com.google.api.gax.grpc.PagedListDescriptor;
 import com.google.api.gax.grpc.PagedListResponseFactory;
@@ -325,16 +327,14 @@ private SubscriptionAdminSettings(Builder settingsBuilder) throws IOException {
           new PagedListDescriptor<
               ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
             public ListSubscriptionsRequest injectToken(
-                ListSubscriptionsRequest payload, Object token) {
-              return ListSubscriptionsRequest.newBuilder(payload)
-                  .setPageToken((String) token)
-                  .build();
+                ListSubscriptionsRequest payload, String token) {
+              return ListSubscriptionsRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -349,7 +349,7 @@ public Integer extractPageSize(ListSubscriptionsRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListSubscriptionsResponse payload) {
+            public String extractNextToken(ListSubscriptionsResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -363,13 +363,13 @@ public Iterable extractResources(ListSubscriptionsResponse payload
       LIST_SNAPSHOTS_PAGE_STR_DESC =
           new PagedListDescriptor() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
-            public ListSnapshotsRequest injectToken(ListSnapshotsRequest payload, Object token) {
-              return ListSnapshotsRequest.newBuilder(payload).setPageToken((String) token).build();
+            public ListSnapshotsRequest injectToken(ListSnapshotsRequest payload, String token) {
+              return ListSnapshotsRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -383,7 +383,7 @@ public Integer extractPageSize(ListSnapshotsRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListSnapshotsResponse payload) {
+            public String extractNextToken(ListSnapshotsResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -400,12 +400,16 @@ public Iterable extractResources(ListSnapshotsResponse payload) {
               ListSubscriptionsRequest, ListSubscriptionsResponse,
               ListSubscriptionsPagedResponse>() {
             @Override
-            public ListSubscriptionsPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListSubscriptionsRequest request,
-                CallContext context) {
-              return new ListSubscriptionsPagedResponse(
-                  callable, LIST_SUBSCRIPTIONS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext
+                  pageContext =
+                      PageContext.create(
+                          callable, LIST_SUBSCRIPTIONS_PAGE_STR_DESC, request, context);
+              return ListSubscriptionsPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
@@ -415,12 +419,14 @@ public ListSubscriptionsPagedResponse createPagedListResponse(
           new PagedListResponseFactory<
               ListSnapshotsRequest, ListSnapshotsResponse, ListSnapshotsPagedResponse>() {
             @Override
-            public ListSnapshotsPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListSnapshotsRequest request,
-                CallContext context) {
-              return new ListSnapshotsPagedResponse(
-                  callable, LIST_SNAPSHOTS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_SNAPSHOTS_PAGE_STR_DESC, request, context);
+              return ListSnapshotsPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminClient.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminClient.java
index d17c03ad1ab7..0feb7790ca28 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminClient.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminClient.java
@@ -444,7 +444,7 @@ public final UnaryCallable getTopicCallable() {
    * 

    * try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
    *   ProjectName project = ProjectName.create("[PROJECT]");
-   *   for (Topic element : topicAdminClient.listTopics(project).iterateAllElements()) {
+   *   for (Topic element : topicAdminClient.listTopics(project).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -472,7 +472,7 @@ public final ListTopicsPagedResponse listTopics(ProjectName project) {
    *   ListTopicsRequest request = ListTopicsRequest.newBuilder()
    *     .setProjectWithProjectName(project)
    *     .build();
-   *   for (Topic element : topicAdminClient.listTopics(request).iterateAllElements()) {
+   *   for (Topic element : topicAdminClient.listTopics(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -499,7 +499,7 @@ public final ListTopicsPagedResponse listTopics(ListTopicsRequest request) {
    *     .build();
    *   ApiFuture<ListTopicsPagedResponse> future = topicAdminClient.listTopicsPagedCallable().futureCall(request);
    *   // Do something
-   *   for (Topic element : future.get().iterateAllElements()) {
+   *   for (Topic element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java
index 1f4b9cdbf81a..5b18edc56f13 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java
@@ -20,6 +20,7 @@
 
 import com.google.api.gax.batching.BatchingSettings;
 import com.google.api.gax.batching.RequestBuilder;
+import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.FlowControlSettings;
 import com.google.api.gax.core.FlowController.LimitExceededBehavior;
 import com.google.api.gax.core.GoogleCredentialsProvider;
@@ -34,6 +35,7 @@
 import com.google.api.gax.grpc.ExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingChannelProvider;
 import com.google.api.gax.grpc.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.PageContext;
 import com.google.api.gax.grpc.PagedCallSettings;
 import com.google.api.gax.grpc.PagedListDescriptor;
 import com.google.api.gax.grpc.PagedListResponseFactory;
@@ -263,13 +265,13 @@ private TopicAdminSettings(Builder settingsBuilder) throws IOException {
       LIST_TOPICS_PAGE_STR_DESC =
           new PagedListDescriptor() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
-            public ListTopicsRequest injectToken(ListTopicsRequest payload, Object token) {
-              return ListTopicsRequest.newBuilder(payload).setPageToken((String) token).build();
+            public ListTopicsRequest injectToken(ListTopicsRequest payload, String token) {
+              return ListTopicsRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -283,7 +285,7 @@ public Integer extractPageSize(ListTopicsRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListTopicsResponse payload) {
+            public String extractNextToken(ListTopicsResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -299,16 +301,14 @@ public Iterable extractResources(ListTopicsResponse payload) {
           new PagedListDescriptor<
               ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
             public ListTopicSubscriptionsRequest injectToken(
-                ListTopicSubscriptionsRequest payload, Object token) {
-              return ListTopicSubscriptionsRequest.newBuilder(payload)
-                  .setPageToken((String) token)
-                  .build();
+                ListTopicSubscriptionsRequest payload, String token) {
+              return ListTopicSubscriptionsRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -325,7 +325,7 @@ public Integer extractPageSize(ListTopicSubscriptionsRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListTopicSubscriptionsResponse payload) {
+            public String extractNextToken(ListTopicSubscriptionsResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -341,12 +341,14 @@ public Iterable extractResources(ListTopicSubscriptionsResponse payload)
           new PagedListResponseFactory<
               ListTopicsRequest, ListTopicsResponse, ListTopicsPagedResponse>() {
             @Override
-            public ListTopicsPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListTopicsRequest request,
-                CallContext context) {
-              return new ListTopicsPagedResponse(
-                  callable, LIST_TOPICS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_TOPICS_PAGE_STR_DESC, request, context);
+              return ListTopicsPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
@@ -358,13 +360,17 @@ public ListTopicsPagedResponse createPagedListResponse(
               ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse,
               ListTopicSubscriptionsPagedResponse>() {
             @Override
-            public ListTopicSubscriptionsPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable
                     callable,
                 ListTopicSubscriptionsRequest request,
-                CallContext context) {
-              return new ListTopicSubscriptionsPagedResponse(
-                  callable, LIST_TOPIC_SUBSCRIPTIONS_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext
+                  pageContext =
+                      PageContext.create(
+                          callable, LIST_TOPIC_SUBSCRIPTIONS_PAGE_STR_DESC, request, context);
+              return ListTopicSubscriptionsPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClientTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClientTest.java
index 8a7705e3ae87..eb2f7b13599e 100644
--- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClientTest.java
+++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClientTest.java
@@ -225,7 +225,7 @@ public void listSubscriptionsTest() {
 
     ListSubscriptionsPagedResponse pagedListResponse = client.listSubscriptions(project);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0));
 
@@ -513,7 +513,7 @@ public void listSnapshotsTest() {
 
     ListSnapshotsPagedResponse pagedListResponse = client.listSnapshots(project);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0));
 
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/TopicAdminClientTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/TopicAdminClientTest.java
index 37bf7498f740..8db6bc9800a3 100644
--- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/TopicAdminClientTest.java
+++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/TopicAdminClientTest.java
@@ -227,7 +227,7 @@ public void listTopicsTest() {
 
     ListTopicsPagedResponse pagedListResponse = client.listTopics(project);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getTopicsList().get(0), resources.get(0));
 
@@ -271,7 +271,7 @@ public void listTopicSubscriptionsTest() {
 
     ListTopicSubscriptionsPagedResponse pagedListResponse = client.listTopicSubscriptions(topic);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0));
     List resourceNames =
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java
index 84fd392dcbae..71237a210945 100644
--- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java
+++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java
@@ -18,7 +18,7 @@
 
 import com.google.cloud.FieldSelector;
 import com.google.cloud.FieldSelector.Helper;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.Policy;
 import com.google.cloud.Service;
 import com.google.cloud.resourcemanager.spi.v1beta1.ResourceManagerRpc;
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java
index af4cba38afe1..2fd581c9c746 100644
--- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java
+++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java
@@ -20,7 +20,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.cloud.BaseService;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.PageImpl;
 import com.google.cloud.PageImpl.NextPageFetcher;
 import com.google.cloud.Policy;
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClient.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClient.java
index 6e5da85d653c..71f617fa46cc 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClient.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClient.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud.spanner;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.spanner.Options.ListOption;
 import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
 import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata;
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Instance.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Instance.java
index b014ae85d3d4..7d2f7e0f12b4 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Instance.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Instance.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud.spanner;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
 import com.google.spanner.admin.instance.v1.UpdateInstanceMetadata;
 import java.util.Map;
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java
index cffcfaf94731..40e93bc4b393 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud.spanner;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.spanner.Options.ListOption;
 import com.google.spanner.admin.instance.v1.CreateInstanceMetadata;
 import com.google.spanner.admin.instance.v1.UpdateInstanceMetadata;
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
index 9c0381012d52..2e9f8a0a5e29 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
@@ -30,7 +30,7 @@
 import com.google.cloud.BaseService;
 import com.google.cloud.ByteArray;
 import com.google.cloud.Date;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.PageImpl;
 import com.google.cloud.PageImpl.NextPageFetcher;
 import com.google.cloud.Timestamp;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java
index 271724cd5b0a..f0808385acd2 100644
--- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java
+++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java
@@ -21,7 +21,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.storage.Acl.Entity;
 import com.google.cloud.storage.Storage.BlobGetOption;
 import com.google.cloud.storage.Storage.BlobListOption;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
index 2cf7c1f001bd..20af29d78d58 100644
--- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
+++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
@@ -19,11 +19,11 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.gax.core.Page;
 import com.google.auth.ServiceAccountSigner;
 import com.google.auth.ServiceAccountSigner.SigningException;
 import com.google.cloud.FieldSelector;
 import com.google.cloud.FieldSelector.Helper;
-import com.google.cloud.Page;
 import com.google.cloud.ReadChannel;
 import com.google.cloud.Service;
 import com.google.cloud.WriteChannel;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java
index c2ec81e683e9..9afcd3d76805 100644
--- a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java
+++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java
@@ -31,13 +31,13 @@
 import static com.google.common.base.Preconditions.checkState;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import com.google.api.gax.core.Page;
 import com.google.api.services.storage.model.BucketAccessControl;
 import com.google.api.services.storage.model.ObjectAccessControl;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.auth.ServiceAccountSigner;
 import com.google.cloud.BaseService;
 import com.google.cloud.BatchResult;
-import com.google.cloud.Page;
 import com.google.cloud.PageImpl;
 import com.google.cloud.PageImpl.NextPageFetcher;
 import com.google.cloud.ReadChannel;
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java
index 4477ee452b0b..9244cb299628 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java
@@ -21,7 +21,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.cloud.HttpTransportOptions;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.BlobId;
 import com.google.cloud.storage.Storage;
@@ -103,10 +103,14 @@ public void setUp() {
     blobPage = new Page() {
 
       @Override
-      public String getNextPageCursor() {
-        return "nextPageCursor";
+      public boolean hasNextPage() {
+        return true;
       }
 
+      @Override
+      public String getNextPageToken() {
+        return "nextPageCursor";
+      }
 
       @Override
       public Page getNextPage() {
@@ -120,8 +124,8 @@ public Iterable getValues() {
       }
 
       @Override
-      public Iterator iterateAll() {
-        return blobList.iterator();
+      public Iterable iterateAll() {
+        return blobList;
       }
     };
   }
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/PagedResponseWrappers.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/PagedResponseWrappers.java
index 0b51f402e6fc..a4f0e49bfd0a 100644
--- a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/PagedResponseWrappers.java
+++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/PagedResponseWrappers.java
@@ -15,14 +15,18 @@
  */
 package com.google.cloud.trace.spi.v1;
 
-import com.google.api.gax.grpc.CallContext;
-import com.google.api.gax.grpc.PagedListDescriptor;
-import com.google.api.gax.grpc.PagedListResponseImpl;
-import com.google.api.gax.grpc.UnaryCallable;
+import com.google.api.gax.core.ApiFunction;
+import com.google.api.gax.core.ApiFuture;
+import com.google.api.gax.core.ApiFutures;
+import com.google.api.gax.grpc.AbstractFixedSizeCollection;
+import com.google.api.gax.grpc.AbstractPage;
+import com.google.api.gax.grpc.AbstractPagedListResponse;
+import com.google.api.gax.grpc.PageContext;
 import com.google.devtools.cloudtrace.v1.ListTracesRequest;
 import com.google.devtools.cloudtrace.v1.ListTracesResponse;
 import com.google.devtools.cloudtrace.v1.Trace;
 import com.google.protobuf.ExperimentalApi;
+import java.util.List;
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
@@ -36,14 +40,75 @@
 public class PagedResponseWrappers {
 
   public static class ListTracesPagedResponse
-      extends PagedListResponseImpl {
-
-    public ListTracesPagedResponse(
-        UnaryCallable callable,
-        PagedListDescriptor pageDescriptor,
-        ListTracesRequest request,
-        CallContext context) {
-      super(callable, pageDescriptor, request, context);
+      extends AbstractPagedListResponse<
+          ListTracesRequest, ListTracesResponse, Trace, ListTracesPage,
+          ListTracesFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListTracesPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListTracesPagedResponse apply(ListTracesPage input) {
+              return new ListTracesPagedResponse(input);
+            }
+          });
+    }
+
+    private ListTracesPagedResponse(ListTracesPage page) {
+      super(page, ListTracesFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListTracesPage
+      extends AbstractPage {
+
+    private ListTracesPage(
+        PageContext context,
+        ListTracesResponse response) {
+      super(context, response);
+    }
+
+    private static ListTracesPage createEmptyPage() {
+      return new ListTracesPage(null, null);
+    }
+
+    @Override
+    protected ListTracesPage createPage(
+        PageContext context,
+        ListTracesResponse response) {
+      return new ListTracesPage(context, response);
+    }
+
+    @Override
+    protected ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListTracesFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListTracesRequest, ListTracesResponse, Trace, ListTracesPage,
+          ListTracesFixedSizeCollection> {
+
+    private ListTracesFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListTracesFixedSizeCollection createEmptyCollection() {
+      return new ListTracesFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListTracesFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListTracesFixedSizeCollection(pages, collectionSize);
     }
   }
 }
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceClient.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceClient.java
index a829e434920a..71f7c329e3a7 100644
--- a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceClient.java
+++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceClient.java
@@ -330,7 +330,7 @@ public final UnaryCallable getTraceCallable() {
    * 

    * try (TraceServiceClient traceServiceClient = TraceServiceClient.create()) {
    *   String projectId = "";
-   *   for (Trace element : traceServiceClient.listTraces(projectId).iterateAllElements()) {
+   *   for (Trace element : traceServiceClient.listTraces(projectId).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -356,7 +356,7 @@ public final ListTracesPagedResponse listTraces(String projectId) {
    *   ListTracesRequest request = ListTracesRequest.newBuilder()
    *     .setProjectId(projectId)
    *     .build();
-   *   for (Trace element : traceServiceClient.listTraces(request).iterateAllElements()) {
+   *   for (Trace element : traceServiceClient.listTraces(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -383,7 +383,7 @@ public final ListTracesPagedResponse listTraces(ListTracesRequest request) {
    *     .build();
    *   ApiFuture<ListTracesPagedResponse> future = traceServiceClient.listTracesPagedCallable().futureCall(request);
    *   // Do something
-   *   for (Trace element : future.get().iterateAllElements()) {
+   *   for (Trace element : future.get().iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java
index 892dd1d3449d..bb3c930db8d1 100644
--- a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java
+++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java
@@ -17,6 +17,7 @@
 
 import static com.google.cloud.trace.spi.v1.PagedResponseWrappers.ListTracesPagedResponse;
 
+import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.PropertiesProvider;
 import com.google.api.gax.core.RetrySettings;
@@ -26,6 +27,7 @@
 import com.google.api.gax.grpc.ExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingChannelProvider;
 import com.google.api.gax.grpc.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.PageContext;
 import com.google.api.gax.grpc.PagedCallSettings;
 import com.google.api.gax.grpc.PagedListDescriptor;
 import com.google.api.gax.grpc.PagedListResponseFactory;
@@ -193,13 +195,13 @@ private TraceServiceSettings(Builder settingsBuilder) throws IOException {
       LIST_TRACES_PAGE_STR_DESC =
           new PagedListDescriptor() {
             @Override
-            public Object emptyToken() {
+            public String emptyToken() {
               return "";
             }
 
             @Override
-            public ListTracesRequest injectToken(ListTracesRequest payload, Object token) {
-              return ListTracesRequest.newBuilder(payload).setPageToken((String) token).build();
+            public ListTracesRequest injectToken(ListTracesRequest payload, String token) {
+              return ListTracesRequest.newBuilder(payload).setPageToken(token).build();
             }
 
             @Override
@@ -215,7 +217,7 @@ public Integer extractPageSize(ListTracesRequest payload) {
             }
 
             @Override
-            public Object extractNextToken(ListTracesResponse payload) {
+            public String extractNextToken(ListTracesResponse payload) {
               return payload.getNextPageToken();
             }
 
@@ -231,12 +233,14 @@ public Iterable extractResources(ListTracesResponse payload) {
           new PagedListResponseFactory<
               ListTracesRequest, ListTracesResponse, ListTracesPagedResponse>() {
             @Override
-            public ListTracesPagedResponse createPagedListResponse(
+            public ApiFuture getFuturePagedResponse(
                 UnaryCallable callable,
                 ListTracesRequest request,
-                CallContext context) {
-              return new ListTracesPagedResponse(
-                  callable, LIST_TRACES_PAGE_STR_DESC, request, context);
+                CallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_TRACES_PAGE_STR_DESC, request, context);
+              return ListTracesPagedResponse.createAsync(pageContext, futureResponse);
             }
           };
 
diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/TraceServiceClientTest.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/TraceServiceClientTest.java
index e312d100a984..0bdebe0538fa 100644
--- a/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/TraceServiceClientTest.java
+++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/TraceServiceClientTest.java
@@ -168,7 +168,7 @@ public void listTracesTest() {
 
     ListTracesPagedResponse pagedListResponse = client.listTraces(projectId);
 
-    List resources = Lists.newArrayList(pagedListResponse.iterateAllElements());
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
     Assert.assertEquals(expectedResponse.getTracesList().get(0), resources.get(0));
 

From 5f5a859cc5b4de93a83fe458f3bffab2ae0304e8 Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Mon, 10 Apr 2017 17:06:22 -0700
Subject: [PATCH 05/15] Update examples

---
 .../examples/bigquery/BigQueryExample.java    | 25 ++---
 .../bigquery/snippets/BigQuerySnippets.java   | 42 +++-----
 .../bigquery/snippets/DatasetSnippets.java    |  6 +-
 .../snippets/InsertDataAndQueryTable.java     |  5 +-
 .../bigquery/snippets/TableSnippets.java      |  6 +-
 .../examples/compute/ComputeExample.java      | 98 +++++++++----------
 .../google/cloud/examples/dns/DnsExample.java |  8 +-
 .../snippets/CreateOrUpdateRecordSets.java    |  4 +-
 .../examples/dns/snippets/DeleteZone.java     |  7 +-
 .../ManipulateZonesAndRecordSets.java         | 24 ++---
 .../examples/logging/LoggingExample.java      | 28 +++---
 .../snippets/CreateAndListMetrics.java        |  7 +-
 .../logging/snippets/CreateAndListSinks.java  |  7 +-
 .../logging/snippets/LoggingSnippets.java     | 35 ++-----
 .../snippets/WriteAndListLogEntries.java      |  7 +-
 .../cloud/examples/pubsub/PubSubExample.java  |  6 +-
 .../SubscriptionAdminClientSnippets.java      |  2 +-
 .../snippets/TopicAdminClientSnippets.java    |  4 +-
 .../snippets/UpdateAndListProjects.java       |  5 +-
 .../examples/storage/StorageExample.java      | 10 +-
 .../storage/snippets/BucketSnippets.java      |  7 +-
 .../CreateAndListBucketsAndBlobs.java         | 10 +-
 .../storage/snippets/StorageSnippets.java     | 10 +-
 23 files changed, 142 insertions(+), 221 deletions(-)

diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java
index 3c023ac40b37..a22ab659fdd2 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java
@@ -173,9 +173,8 @@ Void parse(String... args) throws Exception {
   private static class ListDatasetsAction extends NoArgsAction {
     @Override
     public void run(BigQuery bigquery, Void arg) {
-      Iterator datasetInfoIterator = bigquery.listDatasets().iterateAll();
-      while (datasetInfoIterator.hasNext()) {
-        System.out.println(datasetInfoIterator.next());
+      for(Dataset dataset : bigquery.listDatasets().iterateAll()) {
+        System.out.println(dataset);
       }
     }
   }
@@ -208,9 +207,8 @@ public String params() {
   private static class ListTablesAction extends DatasetAction {
     @Override
     public void run(BigQuery bigquery, DatasetId datasetId) {
-      Iterator tableInfoIterator = bigquery.listTables(datasetId).iterateAll();
-      while (tableInfoIterator.hasNext()) {
-        System.out.println(tableInfoIterator.next());
+      for(Table table : bigquery.listTables(datasetId).iterateAll()) {
+        System.out.println(table);
       }
     }
   }
@@ -317,9 +315,8 @@ public void run(BigQuery bigquery, TableId tableId) {
   private static class ListTableDataAction extends TableAction {
     @Override
     public void run(BigQuery bigquery, TableId tableId) {
-      Iterator> iterator = bigquery.listTableData(tableId).iterateAll();
-      while (iterator.hasNext()) {
-        System.out.println(iterator.next());
+      for(List row : bigquery.listTableData(tableId).iterateAll()) {
+        System.out.println(row);
       }
     }
   }
@@ -352,9 +349,8 @@ public String params() {
   private static class ListJobsAction extends NoArgsAction {
     @Override
     public void run(BigQuery bigquery, Void arg) {
-      Iterator datasetInfoIterator = bigquery.listJobs().iterateAll();
-      while (datasetInfoIterator.hasNext()) {
-        System.out.println(datasetInfoIterator.next());
+      for(Job job : bigquery.listJobs().iterateAll()) {
+        System.out.println(job);
       }
     }
   }
@@ -633,9 +629,8 @@ void run(BigQuery bigquery, QueryRequest queryRequest) throws Exception {
       }
       if (!queryResponse.hasErrors()) {
         System.out.println("Query succeeded. Results:");
-        Iterator> iterator = queryResponse.getResult().iterateAll();
-        while (iterator.hasNext()) {
-          System.out.println(iterator.next());
+        for(List row : queryResponse.getResult().iterateAll()) {
+          System.out.println(row);
         }
       } else {
         System.out.println("Query completed with errors. Errors:");
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
index 24ba2735facc..2a2088a817fe 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
@@ -23,7 +23,7 @@
 package com.google.cloud.examples.bigquery.snippets;
 
 import com.google.api.client.util.Charsets;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption;
 import com.google.cloud.bigquery.BigQuery.DatasetListOption;
@@ -140,9 +140,7 @@ public Table updateTable(String datasetName, String tableName, String newFriendl
   public Page listDatasets() {
     // [START listDatasets]
     Page datasets = bigquery.listDatasets(DatasetListOption.pageSize(100));
-    Iterator datasetIterator = datasets.iterateAll();
-    while (datasetIterator.hasNext()) {
-      Dataset dataset = datasetIterator.next();
+    for(Dataset dataset : datasets.iterateAll()) {
       // do something with the dataset
     }
     // [END listDatasets]
@@ -157,9 +155,7 @@ public Page listDatasets() {
   public Page listDatasets(String projectId) {
     // [START listDatasets]
     Page datasets = bigquery.listDatasets(projectId, DatasetListOption.pageSize(100));
-    Iterator datasetIterator = datasets.iterateAll();
-    while (datasetIterator.hasNext()) {
-      Dataset dataset = datasetIterator.next();
+    for(Dataset dataset : datasets.iterateAll()) {
       // do something with the dataset
     }
     // [END listDatasets]
@@ -248,9 +244,7 @@ public Boolean deleteTableFromId(String projectId, String datasetName, String ta
   public Page
 listTables(String datasetName) {
     // [START listTables]
     Page
 tables = bigquery.listTables(datasetName, TableListOption.pageSize(100));
-    Iterator
 tableIterator = tables.iterateAll();
-    while (tableIterator.hasNext()) {
-      Table table = tableIterator.next();
+    for(Table table : tables.iterateAll()) {
       // do something with the table
     }
     // [END listTables]
@@ -268,9 +262,7 @@ public Page
 listTablesFromId(String projectId, String datasetName) {
     // [START listTablesFromId]
     DatasetId datasetId = DatasetId.of(projectId, datasetName);
     Page
 tables = bigquery.listTables(datasetId, TableListOption.pageSize(100));
-    Iterator
 tableIterator = tables.iterateAll();
-    while (tableIterator.hasNext()) {
-      Table table = tableIterator.next();
+    for(Table table : tables.iterateAll()) {
       // do something with the table
     }
     // [END listTablesFromId]
@@ -452,9 +444,7 @@ public Page> listTableData(String datasetName, String tableName
     // [START listTableData]
     Page> tableData =
         bigquery.listTableData(datasetName, tableName, TableDataListOption.pageSize(100));
-    Iterator> rowIterator = tableData.iterateAll();
-    while (rowIterator.hasNext()) {
-      List row = rowIterator.next();
+    for(List row : tableData.iterateAll()) {
       // do something with the row
     }
     // [END listTableData]
@@ -472,9 +462,7 @@ public Page> listTableDataFromId(String datasetName, String tab
     TableId tableIdObject = TableId.of(datasetName, tableName);
     Page> tableData =
         bigquery.listTableData(tableIdObject, TableDataListOption.pageSize(100));
-    Iterator> rowIterator = tableData.iterateAll();
-    while (rowIterator.hasNext()) {
-      List row = rowIterator.next();
+    for(List row : tableData.iterateAll()) {
       // do something with the row
     }
     // [END listTableDataFromId]
@@ -507,9 +495,7 @@ public Job createJob(String query) {
   public Page listJobs() {
     // [START listJobs]
     Page jobs = bigquery.listJobs(JobListOption.pageSize(100));
-    Iterator jobIterator = jobs.iterateAll();
-    while (jobIterator.hasNext()) {
-      Job job = jobIterator.next();
+    for(Job job : jobs.iterateAll()) {
       // do something with the job
     }
     // [END listJobs]
@@ -601,9 +587,7 @@ public QueryResponse runQuery(String query) throws InterruptedException {
       // handle errors
     }
     QueryResult result = response.getResult();
-    Iterator> rowIterator = result.iterateAll();
-    while (rowIterator.hasNext()) {
-      List row = rowIterator.next();
+    for(List row : result.iterateAll()) {
       // do something with the data
     }
     // [END runQuery]
@@ -631,9 +615,7 @@ public QueryResponse runQueryWithParameters(String query) throws InterruptedExce
       // handle errors
     }
     QueryResult result = response.getResult();
-    Iterator> rowIterator = result.iterateAll();
-    while (rowIterator.hasNext()) {
-      List row = rowIterator.next();
+    for(List row : result.iterateAll()) {
       // do something with the data
     }
     // [END runQueryWithParameters]
@@ -658,9 +640,7 @@ public QueryResponse queryResults(final String query) throws InterruptedExceptio
       // handle errors
     }
     QueryResult result = response.getResult();
-    Iterator> rowIterator = result.iterateAll();
-    while (rowIterator.hasNext()) {
-      List row = rowIterator.next();
+    for(List row : result.iterateAll()) {
       // do something with the data
     }
     // [END queryResults]
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java
index a345a037ac7e..f8dacfcde6c8 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java
@@ -22,7 +22,7 @@
 
 package com.google.cloud.examples.bigquery.snippets;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.bigquery.Dataset;
 import com.google.cloud.bigquery.Dataset.Builder;
 import com.google.cloud.bigquery.Field;
@@ -112,9 +112,7 @@ public boolean deleteDataset() {
   public Page
 list() {
      // [START list]
     Page
 tables = dataset.list();
-    Iterator
 tableIterator = tables.iterateAll();
-    while (tableIterator.hasNext()) {
-      Table table = tableIterator.next();
+    for(Table table : tables.iterateAll()) {
       // do something with the table
     }
     // [END list]
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java
index c1ed6e695f95..2b21900de895 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java
@@ -92,10 +92,9 @@ public static void main(String... args) throws InterruptedException {
       queryResponse = bigquery.getQueryResults(queryResponse.getJobId());
     }
     // Read rows
-    Iterator> rowIterator = queryResponse.getResult().iterateAll();
     System.out.println("Table rows:");
-    while (rowIterator.hasNext()) {
-      System.out.println(rowIterator.next());
+    for(List row : queryResponse.getResult().iterateAll()) {
+      System.out.println(row);
     }
   }
 }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java
index cae06209c636..a217b1b32477 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java
@@ -22,7 +22,7 @@
 
 package com.google.cloud.examples.bigquery.snippets;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.WaitForOption;
 import com.google.cloud.bigquery.BigQuery.JobField;
 import com.google.cloud.bigquery.BigQuery.JobOption;
@@ -171,9 +171,7 @@ public InsertAllResponse insertWithParams(String rowId1, String rowId2) {
   public Page> list() {
     // [START list]
     Page> page = table.list(TableDataListOption.pageSize(100));
-    Iterator> rowIterator = page.iterateAll();
-    while (rowIterator.hasNext()) {
-      List row = rowIterator.next();
+    for(List row : page.iterateAll()) {
       // do something with the row
     }
     // [END list]
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java
index 9405da0ac32d..646adafe43c9 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.examples.compute;
 
+import com.google.api.gax.core.Page;
 import com.google.cloud.compute.Address;
 import com.google.cloud.compute.AddressId;
 import com.google.cloud.compute.AddressInfo;
@@ -306,14 +307,14 @@ Void parse(String... args) throws Exception {
   private static class ListDiskTypesAction extends OptionalZoneAction {
     @Override
     public void run(Compute compute, ZoneId zone) {
-      Iterator diskTypeIterator;
+      Page diskTypePage;
       if (zone != null) {
-        diskTypeIterator = compute.listDiskTypes(zone.getZone()).iterateAll();
+        diskTypePage = compute.listDiskTypes(zone.getZone());
       } else {
-        diskTypeIterator = compute.listDiskTypes().iterateAll();
+        diskTypePage = compute.listDiskTypes();
       }
-      while (diskTypeIterator.hasNext()) {
-        System.out.println(diskTypeIterator.next());
+      for(DiskType diskType : diskTypePage.iterateAll()) {
+        System.out.println(diskType);
       }
     }
   }
@@ -361,14 +362,14 @@ public String params() {
   private static class ListMachineTypesAction extends OptionalZoneAction {
     @Override
     public void run(Compute compute, ZoneId zone) {
-      Iterator machineTypeIterator;
+      Page machineTypePage;
       if (zone != null) {
-        machineTypeIterator = compute.listMachineTypes(zone.getZone()).iterateAll();
+        machineTypePage = compute.listMachineTypes(zone.getZone());
       } else {
-        machineTypeIterator = compute.listMachineTypes().iterateAll();
+        machineTypePage = compute.listMachineTypes();
       }
-      while (machineTypeIterator.hasNext()) {
-        System.out.println(machineTypeIterator.next());
+      for(MachineType diskType : machineTypePage.iterateAll()) {
+        System.out.println(diskType);
       }
     }
   }
@@ -413,9 +414,8 @@ public String params() {
   private static class ListRegionsAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      Iterator regionIterator = compute.listRegions().iterateAll();
-      while (regionIterator.hasNext()) {
-        System.out.println(regionIterator.next());
+      for(Region region : compute.listRegions().iterateAll()) {
+        System.out.println(region);
       }
     }
   }
@@ -460,9 +460,8 @@ public String params() {
   private static class ListZonesAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      Iterator zoneIterator = compute.listZones().iterateAll();
-      while (zoneIterator.hasNext()) {
-        System.out.println(zoneIterator.next());
+      for(Zone zone : compute.listZones().iterateAll()) {
+        System.out.println(zone);
       }
     }
   }
@@ -537,9 +536,8 @@ public String params() {
   private static class ListGlobalOperationsAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      Iterator operationIterator = compute.listGlobalOperations().iterateAll();
-      while (operationIterator.hasNext()) {
-        System.out.println(operationIterator.next());
+      for(Operation operation : compute.listGlobalOperations().iterateAll()) {
+        System.out.println(operation);
       }
     }
   }
@@ -553,10 +551,8 @@ public void run(Compute compute, Void arg) {
   private static class ListZoneOperationsAction extends ComputeAction {
     @Override
     public void run(Compute compute, ZoneId zone) {
-      Iterator operationIterator =
-          compute.listZoneOperations(zone.getZone()).iterateAll();
-      while (operationIterator.hasNext()) {
-        System.out.println(operationIterator.next());
+      for(Operation operation : compute.listZoneOperations(zone.getZone()).iterateAll()) {
+        System.out.println(operation);
       }
     }
 
@@ -588,10 +584,8 @@ public String params() {
   private static class ListRegionOperationsAction extends ComputeAction {
     @Override
     public void run(Compute compute, RegionId region) {
-      Iterator operationIterator =
-          compute.listRegionOperations(region.getRegion()).iterateAll();
-      while (operationIterator.hasNext()) {
-        System.out.println(operationIterator.next());
+      for(Operation operation : compute.listRegionOperations(region.getRegion()).iterateAll()) {
+        System.out.println(operation);
       }
     }
 
@@ -775,14 +769,14 @@ public void run(Compute compute, RegionOperationId operation) {
   private static class ListAddressesAction extends OptionalRegionAction {
     @Override
     public void run(Compute compute, RegionId region) {
-      Iterator
 addressIterator;
+      Page
 addressPage;
       if (region != null) {
-        addressIterator = compute.listRegionAddresses(region.getRegion()).iterateAll();
+        addressPage = compute.listRegionAddresses(region.getRegion());
       } else {
-        addressIterator = compute.listAddresses().iterateAll();
+        addressPage = compute.listAddresses();
       }
-      while (addressIterator.hasNext()) {
-        System.out.println(addressIterator.next());
+      for(Address address : addressPage.iterateAll()) {
+        System.out.println(address);
       }
     }
   }
@@ -891,9 +885,8 @@ public void run(Compute compute, AddressId address) throws InterruptedException
   private static class ListSnapshotsAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      Iterator snapshotIterator = compute.listSnapshots().iterateAll();
-      while (snapshotIterator.hasNext()) {
-        System.out.println(snapshotIterator.next());
+      for(Snapshot snapshot : compute.listSnapshots().iterateAll()) {
+        System.out.println(snapshot);
       }
     }
   }
@@ -1015,9 +1008,8 @@ protected String params() {
   private static class ListImagesAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      Iterator imageIterator = compute.listImages().iterateAll();
-      while (imageIterator.hasNext()) {
-        System.out.println(imageIterator.next());
+      for(Image image : compute.listImages().iterateAll()) {
+        System.out.println(image);
       }
     }
   }
@@ -1201,9 +1193,8 @@ public void run(Compute compute, DiskId disk) throws InterruptedException {
   private static class ListDisksAction extends OptionalZoneAction {
     @Override
     public void run(Compute compute, ZoneId zone) {
-      Iterator diskIterator = compute.listDisks().iterateAll();
-      while (diskIterator.hasNext()) {
-        System.out.println(diskIterator.next());
+      for(Disk disk : compute.listDisks().iterateAll()) {
+        System.out.println(disk);
       }
     }
   }
@@ -1330,9 +1321,8 @@ protected String params() {
   private static class ListNetworksAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      Iterator networkIterator = compute.listNetworks().iterateAll();
-      while (networkIterator.hasNext()) {
-        System.out.println(networkIterator.next());
+      for(Network network : compute.listNetworks().iterateAll()) {
+        System.out.println(network);
       }
     }
   }
@@ -1490,14 +1480,14 @@ private static class ListSubnetworksAction extends OptionalRegionAction {
 
     @Override
     public void run(Compute compute, RegionId region) {
-      Iterator subnetworkIterator;
+      Page subnetworkPage;
       if (region != null) {
-        subnetworkIterator = compute.listSubnetworks(region.getRegion()).iterateAll();
+        subnetworkPage = compute.listSubnetworks(region.getRegion());
       } else {
-        subnetworkIterator = compute.listSubnetworks().iterateAll();
+        subnetworkPage = compute.listSubnetworks();
       }
-      while (subnetworkIterator.hasNext()) {
-        System.out.println(subnetworkIterator.next());
+      for(Subnetwork subnetwork : subnetworkPage.iterateAll()) {
+        System.out.println(subnetwork);
       }
     }
   }
@@ -1617,14 +1607,14 @@ protected String params() {
   private static class ListInstancesAction extends OptionalZoneAction {
     @Override
     public void run(Compute compute, ZoneId zone) {
-      Iterator instanceIterator;
+      Page instancePage;
       if (zone != null) {
-        instanceIterator = compute.listInstances(zone.getZone()).iterateAll();
+        instancePage = compute.listInstances(zone.getZone());
       } else {
-        instanceIterator = compute.listInstances().iterateAll();
+        instancePage = compute.listInstances();
       }
-      while (instanceIterator.hasNext()) {
-        System.out.println(instanceIterator.next());
+      for(Instance instance : instancePage.iterateAll()) {
+        System.out.println(instance);
       }
     }
   }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java
index ec9492d5a2c3..2350c9172719 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java
@@ -108,7 +108,7 @@ private static class ListZonesAction implements DnsAction {
      */
     @Override
     public void run(Dns dns, String... args) {
-      Iterator zoneIterator = dns.listZones().iterateAll();
+      Iterator zoneIterator = dns.listZones().iterateAll().iterator();
       if (zoneIterator.hasNext()) {
         System.out.println("The project contains the following zones:");
         while (zoneIterator.hasNext()) {
@@ -288,7 +288,7 @@ private static class ListDnsRecordsAction implements DnsAction {
     @Override
     public void run(Dns dns, String... args) {
       String zoneName = args[0];
-      Iterator iterator = dns.listRecordSets(zoneName).iterateAll();
+      Iterator iterator = dns.listRecordSets(zoneName).iterateAll().iterator();
       if (iterator.hasNext()) {
         System.out.printf("Record sets for zone %s:%n", zoneName);
         while (iterator.hasNext()) {
@@ -325,9 +325,9 @@ public void run(Dns dns, String... args) {
       if (args.length > 2) {
         Dns.SortingOrder sortOrder = Dns.SortingOrder.valueOf(args[2].toUpperCase());
         iterator = dns.listChangeRequests(zoneName,
-            Dns.ChangeRequestListOption.sortOrder(sortOrder)).iterateAll();
+            Dns.ChangeRequestListOption.sortOrder(sortOrder)).iterateAll().iterator();
       } else {
-        iterator = dns.listChangeRequests(zoneName).iterateAll();
+        iterator = dns.listChangeRequests(zoneName).iterateAll().iterator();
       }
       if (iterator.hasNext()) {
         System.out.printf("Change requests for zone %s:%n", zoneName);
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java
index e1bfc163e849..6ef6e0cde4c2 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java
@@ -59,9 +59,7 @@ public static void main(String... args) {
 
     // Verify a www.. type A record does not exist yet.
     // If it does exist, we will overwrite it with our prepared record.
-    Iterator recordSetIterator = zone.listRecordSets().iterateAll();
-    while (recordSetIterator.hasNext()) {
-      RecordSet current = recordSetIterator.next();
+    for(RecordSet current :  zone.listRecordSets().iterateAll()) {
       if (toCreate.getName().equals(current.getName())
           && toCreate.getType().equals(current.getType())) {
         changeBuilder.delete(current);
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java
index 009c7910d2dc..c3e937e9629b 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java
@@ -44,13 +44,12 @@ public static void main(String... args) {
     // Change this to a zone name that exists within your project and that you want to delete.
     String zoneName = "my-unique-zone";
 
-    // Get iterator for the existing record sets which have to be deleted before deleting the zone
-    Iterator recordIterator = dns.listRecordSets(zoneName).iterateAll();
+    // Get iterable for the existing record sets which have to be deleted before deleting the zone
+    Iterable recordIterable = dns.listRecordSets(zoneName).iterateAll();
 
     // Make a change for deleting the records
     ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.newBuilder();
-    while (recordIterator.hasNext()) {
-      RecordSet current = recordIterator.next();
+    for(RecordSet current : recordIterable) {
       // SOA and NS records cannot be deleted
       if (!RecordSet.Type.SOA.equals(current.getType())
           && !RecordSet.Type.NS.equals(current.getType())) {
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java
index b0b43bedd939..69cd62187525 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java
@@ -22,6 +22,7 @@
 
 package com.google.cloud.examples.dns.snippets;
 
+import com.google.api.gax.core.Page;
 import com.google.cloud.dns.ChangeRequest;
 import com.google.cloud.dns.ChangeRequestInfo;
 import com.google.cloud.dns.Dns;
@@ -71,9 +72,8 @@ public static void main(String... args) {
 
     // Verify the type A record does not exist yet.
     // If it does exist, we will overwrite it with our prepared record.
-    Iterator recordSetIterator = zone.listRecordSets().iterateAll();
-    while (recordSetIterator.hasNext()) {
-      RecordSet current = recordSetIterator.next();
+    Page recordSetPage = zone.listRecordSets();
+    for(RecordSet current : recordSetPage.iterateAll()) {
       if (toCreate.getName().equals(current.getName())
           && toCreate.getType().equals(current.getType())) {
         changeBuilder.delete(current);
@@ -95,31 +95,27 @@ public static void main(String... args) {
     System.out.println("The change request has been applied.");
 
     // List all your zones
-    Iterator zoneIterator = dns.listZones().iterateAll();
     int counter = 1;
-    while (zoneIterator.hasNext()) {
-      System.out.printf("#%d.: %s%n%n", counter, zoneIterator.next());
+    for(Zone currentZone : dns.listZones().iterateAll()) {
+      System.out.printf("#%d.: %s%n%n", counter, currentZone);
       counter++;
     }
 
     // List the record sets in a particular zone
-    recordSetIterator = zone.listRecordSets().iterateAll();
     System.out.println(String.format("Record sets inside %s:", zone.getName()));
-    while (recordSetIterator.hasNext()) {
-      System.out.println(recordSetIterator.next());
+    for(RecordSet recordSet : recordSetPage.iterateAll()) {
+      System.out.println(recordSet);
     }
 
     // List the change requests applied to a particular zone
-    Iterator changeIterator = zone.listChangeRequests().iterateAll();
     System.out.println(String.format("The history of changes in %s:", zone.getName()));
-    while (changeIterator.hasNext()) {
-      System.out.println(changeIterator.next());
+    for(ChangeRequest currentChangeRequest : zone.listChangeRequests().iterateAll()) {
+      System.out.println(currentChangeRequest);
     }
 
     // Make a change for deleting the record sets
     changeBuilder = ChangeRequestInfo.newBuilder();
-    while (recordSetIterator.hasNext()) {
-      RecordSet current = recordSetIterator.next();
+    for(RecordSet current : recordSetPage.iterateAll()) {
       // SOA and NS records cannot be deleted
       if (!RecordSet.Type.SOA.equals(current.getType())
           && !RecordSet.Type.NS.equals(current.getType())) {
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java
index 20265cc2c6ac..71304538f305 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.examples.logging;
 
+import com.google.api.gax.core.Page;
 import com.google.cloud.MonitoredResource;
 import com.google.cloud.MonitoredResourceDescriptor;
 import com.google.cloud.logging.LogEntry;
@@ -40,6 +41,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import sun.rmi.runtime.Log;
 
 /**
  * An example of using Stackdriver Logging.
@@ -172,9 +174,8 @@ Void parse(String... args) throws Exception {
   private static class ListMetricsAction extends NoArgsAction {
     @Override
     public void run(Logging logging, Void arg) {
-      Iterator metricIterator = logging.listMetrics().iterateAll();
-      while (metricIterator.hasNext()) {
-        System.out.println(metricIterator.next());
+      for(Metric metric : logging.listMetrics().iterateAll()) {
+        System.out.println(metric);
       }
     }
   }
@@ -266,9 +267,8 @@ public String params() {
   private static class ListSinksAction extends NoArgsAction {
     @Override
     public void run(Logging logging, Void arg) {
-      Iterator sinkIterator = logging.listSinks().iterateAll();
-      while (sinkIterator.hasNext()) {
-        System.out.println(sinkIterator.next());
+      for(Sink sink : logging.listSinks().iterateAll()) {
+        System.out.println(sink);
       }
     }
   }
@@ -377,10 +377,8 @@ public String params() {
   private static class ListResourceDescriptorsAction extends NoArgsAction {
     @Override
     public void run(Logging logging, Void arg) {
-      Iterator monitoredResourceIterator =
-          logging.listMonitoredResourceDescriptors().iterateAll();
-      while (monitoredResourceIterator.hasNext()) {
-        System.out.println(monitoredResourceIterator.next());
+      for(MonitoredResourceDescriptor descriptor : logging.listMonitoredResourceDescriptors().iterateAll()) {
+        System.out.println(descriptor);
       }
     }
   }
@@ -441,14 +439,14 @@ public String params() {
   private static class ListEntriesAction extends LoggingAction {
     @Override
     public void run(Logging logging, String filter) {
-      Iterator entryIterator;
+      Page entryPage;
       if (filter == null) {
-        entryIterator = logging.listLogEntries().iterateAll();
+        entryPage = logging.listLogEntries();
       } else {
-        entryIterator = logging.listLogEntries(EntryListOption.filter(filter)).iterateAll();
+        entryPage = logging.listLogEntries(EntryListOption.filter(filter));
       }
-      while (entryIterator.hasNext()) {
-        System.out.println(entryIterator.next());
+      for(LogEntry entry : entryPage.iterateAll()) {
+        System.out.println(entry);
       }
     }
 
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java
index 0707aea1ae2f..3bcb9ccad1a9 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud.examples.logging.snippets;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.logging.Logging;
 import com.google.cloud.logging.LoggingOptions;
 import com.google.cloud.logging.Metric;
@@ -46,9 +46,8 @@ public static void main(String... args) throws Exception {
 
       // List metrics
       Page metrics = logging.listMetrics();
-      Iterator metricIterator = metrics.iterateAll();
-      while (metricIterator.hasNext()) {
-        System.out.println(metricIterator.next());
+      for(Metric metric : metrics.iterateAll()) {
+        System.out.println(metric);
       }
     }
   }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java
index 7bd363280a0f..bd0b00a3772e 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java
@@ -16,7 +16,7 @@
 
 package com.google.cloud.examples.logging.snippets;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.logging.Logging;
 import com.google.cloud.logging.LoggingOptions;
 import com.google.cloud.logging.Sink;
@@ -46,9 +46,8 @@ public static void main(String... args) throws Exception {
 
       // List sinks
       Page sinks = logging.listSinks();
-      Iterator sinkIterator = sinks.iterateAll();
-      while (sinkIterator.hasNext()) {
-        System.out.println(sinkIterator.next());
+      for(Sink sink : sinks.iterateAll()) {
+        System.out.println(sink);
       }
     }
   }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java
index be7491d266d9..1f53fcbff44d 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java
@@ -25,7 +25,7 @@
 import com.google.cloud.AsyncPage;
 import com.google.cloud.MonitoredResource;
 import com.google.cloud.MonitoredResourceDescriptor;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.logging.LogEntry;
 import com.google.cloud.logging.Logging;
 import com.google.cloud.logging.Logging.EntryListOption;
@@ -47,6 +47,7 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import sun.rmi.runtime.Log;
 
 public class LoggingSnippets {
 
@@ -165,9 +166,7 @@ public Sink getSinkAsync(String sinkName) throws ExecutionException, Interrupted
   public Page listSinks() {
     // [START listSinks]
     Page sinks = logging.listSinks(ListOption.pageSize(100));
-    Iterator sinkIterator = sinks.iterateAll();
-    while (sinkIterator.hasNext()) {
-      Sink sink = sinkIterator.next();
+    for(Sink sink : sinks.iterateAll()) {
       // do something with the sink
     }
     // [END listSinks]
@@ -183,9 +182,7 @@ public Page listSinksAsync() throws ExecutionException, InterruptedExcepti
     Future> future = logging.listSinksAsync(ListOption.pageSize(100));
     // ...
     AsyncPage sinks = future.get();
-    Iterator sinkIterator = sinks.iterateAll();
-    while (sinkIterator.hasNext()) {
-      Sink sink = sinkIterator.next();
+    for(Sink sink : sinks.iterateAll()) {
       // do something with the sink
     }
     // [END listSinksAsync]
@@ -272,9 +269,7 @@ public Page listMonitoredResourceDescriptors() {
     // [START listMonitoredResourceDescriptors]
     Page descriptors =
         logging.listMonitoredResourceDescriptors(ListOption.pageSize(100));
-    Iterator descriptorIterator = descriptors.iterateAll();
-    while (descriptorIterator.hasNext()) {
-      MonitoredResourceDescriptor descriptor = descriptorIterator.next();
+    for(MonitoredResourceDescriptor descriptor : descriptors.iterateAll()) {
       // do something with the descriptor
     }
     // [END listMonitoredResourceDescriptors]
@@ -292,9 +287,7 @@ public Page listMonitoredResourceDescriptorsAsync()
         logging.listMonitoredResourceDescriptorsAsync(ListOption.pageSize(100));
     // ...
     AsyncPage descriptors = future.get();
-    Iterator descriptorIterator = descriptors.iterateAll();
-    while (descriptorIterator.hasNext()) {
-      MonitoredResourceDescriptor descriptor = descriptorIterator.next();
+    for(MonitoredResourceDescriptor descriptor : descriptors.iterateAll()) {
       // do something with the descriptor
     }
     // [END listMonitoredResourceDescriptorsAsync]
@@ -402,9 +395,7 @@ public Metric getMetricAsync(String metricName) throws ExecutionException, Inter
   public Page listMetrics() {
     // [START listMetrics]
     Page metrics = logging.listMetrics(ListOption.pageSize(100));
-    Iterator metricIterator = metrics.iterateAll();
-    while (metricIterator.hasNext()) {
-      Metric metric = metricIterator.next();
+    for(Metric metric : metrics.iterateAll()) {
       // do something with the metric
     }
     // [END listMetrics]
@@ -420,9 +411,7 @@ public Page listMetricsAsync() throws ExecutionException, InterruptedExc
     Future> future = logging.listMetricsAsync(ListOption.pageSize(100));
     // ...
     AsyncPage metrics = future.get();
-    Iterator metricIterator = metrics.iterateAll();
-    while (metricIterator.hasNext()) {
-      Metric metric = metricIterator.next();
+    for(Metric metric : metrics.iterateAll()) {
       // do something with the metric
     }
     // [END listMetricsAsync]
@@ -513,9 +502,7 @@ public Future writeAsync(String logName) {
   public Page listLogEntries(String filter) {
     // [START listLogEntries]
     Page entries = logging.listLogEntries(EntryListOption.filter(filter));
-    Iterator entryIterator = entries.iterateAll();
-    while (entryIterator.hasNext()) {
-      LogEntry entry = entryIterator.next();
+    for(LogEntry entry : entries.iterateAll()) {
       // do something with the entry
     }
     // [END listLogEntries]
@@ -534,9 +521,7 @@ public Page listLogEntriesAsync(String filter)
         logging.listLogEntriesAsync(EntryListOption.filter(filter));
     // ...
     AsyncPage entries = future.get();
-    Iterator entryIterator = entries.iterateAll();
-    while (entryIterator.hasNext()) {
-      LogEntry entry = entryIterator.next();
+    for(LogEntry entry : entries.iterateAll()) {
       // do something with the entry
     }
     // [END listLogEntriesAsync]
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java
index 825159e30bc2..8b286c7b9742 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java
@@ -17,7 +17,7 @@
 package com.google.cloud.examples.logging.snippets;
 
 import com.google.cloud.MonitoredResource;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.logging.LogEntry;
 import com.google.cloud.logging.Logging;
 import com.google.cloud.logging.Logging.EntryListOption;
@@ -53,9 +53,8 @@ public static void main(String... args) throws Exception {
       // List log entries
       Page entries = logging.listLogEntries(
           EntryListOption.filter("logName=projects/" + options.getProjectId() + "/logs/test-log"));
-      Iterator entryIterator = entries.iterateAll();
-      while (entryIterator.hasNext()) {
-        System.out.println(entryIterator.next());
+      for(LogEntry logEntry : entries.iterateAll()) {
+        System.out.println(logEntry);
       }
     }
   }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java
index ff71bafd9619..46cae4c90ec7 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java
@@ -186,7 +186,7 @@ public void run(Void arg) throws Exception {
                                 .setProjectWithProjectName(ProjectName.create(projectId))
                                 .build();
                 PagedResponseWrappers.ListTopicsPagedResponse response = topicAdminClient.listTopics(listTopicsRequest);
-                Iterable topics = response.iterateAllElements();
+                Iterable topics = response.iterateAll();
                 for (Topic topic : topics) {
                     System.out.println(topic.getName());
                 }
@@ -270,7 +270,7 @@ public void run(String topic) throws Exception {
                 try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
                     PagedResponseWrappers.ListSubscriptionsPagedResponse response =
                             subscriptionAdminClient.listSubscriptions(ProjectName.create(projectId));
-                    Iterable subscriptions = response.iterateAllElements();
+                    Iterable subscriptions = response.iterateAll();
                     for (Subscription subscription : subscriptions) {
                         System.out.println(subscription.getName());
                     }
@@ -279,7 +279,7 @@ public void run(String topic) throws Exception {
                 try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
                     PagedResponseWrappers.ListTopicSubscriptionsPagedResponse response =
                             topicAdminClient.listTopicSubscriptions(TopicName.create(projectId, topic));
-                    Iterable subscriptionNames = response.iterateAllElements();
+                    Iterable subscriptionNames = response.iterateAll();
                     for (String subscriptionName : subscriptionNames) {
                         System.out.println(subscriptionName);
                     }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java
index 9af97c4e4d2f..d43312fdd622 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java
@@ -104,7 +104,7 @@ public ListSubscriptionsPagedResponse listSubscriptions() throws Exception {
               .build();
       ListSubscriptionsPagedResponse response =
           subscriptionAdminClient.listSubscriptions(listSubscriptionsRequest);
-      Iterable subscriptions = response.iterateAllElements();
+      Iterable subscriptions = response.iterateAll();
       for (Subscription subscription : subscriptions) {
         // do something with the subscription
       }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicAdminClientSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicAdminClientSnippets.java
index 79e287cd589e..75d509d57f11 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicAdminClientSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicAdminClientSnippets.java
@@ -66,7 +66,7 @@ public ListTopicsPagedResponse listTopics() throws Exception {
               .setProjectWithProjectName(ProjectName.create(projectId))
               .build();
       ListTopicsPagedResponse response = topicAdminClient.listTopics(listTopicsRequest);
-      Iterable topics = response.iterateAllElements();
+      Iterable topics = response.iterateAll();
       for (Topic topic : topics) {
         // do something with the topic
       }
@@ -87,7 +87,7 @@ public ListTopicSubscriptionsPagedResponse listTopicSubscriptions(String topicId
               .build();
       ListTopicSubscriptionsPagedResponse response =
           topicAdminClient.listTopicSubscriptions(request);
-      Iterable subscriptionNames = response.iterateAllElements();
+      Iterable subscriptionNames = response.iterateAll();
       for (String subscriptionName : subscriptionNames) {
         // do something with the subscription name
       }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java
index eb60ae917ecb..71465e7ea886 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java
@@ -53,10 +53,9 @@ public static void main(String... args) {
     }
 
     // List all the projects you have permission to view.
-    Iterator projectIterator = resourceManager.list().iterateAll();
     System.out.println("Projects I can view:");
-    while (projectIterator.hasNext()) {
-      System.out.println(projectIterator.next().getProjectId());
+    for(Project currentProject : resourceManager.list().iterateAll()) {
+      System.out.println(currentProject.getProjectId());
     }
   }
 }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java
index 24e8eab27d41..ad7b982497cb 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java
@@ -268,9 +268,8 @@ String parse(String... args) {
     public void run(Storage storage, String bucketName) {
       if (bucketName == null) {
         // list buckets
-        Iterator bucketIterator = storage.list().iterateAll();
-        while (bucketIterator.hasNext()) {
-          System.out.println(bucketIterator.next());
+        for(Bucket bucket : storage.list().iterateAll()) {
+          System.out.println(bucket);
         }
       } else {
         // list a bucket's blobs
@@ -279,9 +278,8 @@ public void run(Storage storage, String bucketName) {
           System.out.println("No such bucket");
           return;
         }
-        Iterator blobIterator = bucket.list().iterateAll();
-        while (blobIterator.hasNext()) {
-          System.out.println(blobIterator.next());
+        for(Blob blob : bucket.list().iterateAll()) {
+          System.out.println(blob);
         }
       }
     }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/BucketSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/BucketSnippets.java
index 438341132da3..3dae129d80f5 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/BucketSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/BucketSnippets.java
@@ -24,7 +24,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.storage.Acl;
 import com.google.cloud.storage.Acl.User;
 import com.google.cloud.storage.Blob;
@@ -35,7 +35,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -116,9 +115,7 @@ public boolean delete() {
   public Page listBlobs() {
     // [START listBlobs]
     Page blobs = bucket.list();
-    Iterator blobIterator = blobs.iterateAll();
-    while (blobIterator.hasNext()) {
-      Blob blob = blobIterator.next();
+    for(Blob blob : blobs.iterateAll()) {
       // do something with the blob
     }
     // [END listBlobs]
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java
index 79a4854d9a91..94fc02827dd8 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java
@@ -54,17 +54,15 @@ public static void main(String... args) {
     String blobContent = new String(blob.getContent(), UTF_8);
 
     // List all your buckets
-    Iterator bucketIterator = storage.list().iterateAll();
     System.out.println("My buckets:");
-    while (bucketIterator.hasNext()) {
-      System.out.println(bucketIterator.next());
+    for(Bucket currentBucket : storage.list().iterateAll()) {
+      System.out.println(currentBucket);
     }
 
     // List the blobs in a particular bucket
-    Iterator blobIterator = bucket.list().iterateAll();
     System.out.println("My blobs:");
-    while (blobIterator.hasNext()) {
-      System.out.println(blobIterator.next());
+    for(Blob currentBlob : bucket.list().iterateAll()) {
+      System.out.println(currentBlob);
     }
   }
 }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java
index 0355663786c6..ce7bdbc8a462 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java
@@ -27,7 +27,7 @@
 import com.google.auth.ServiceAccountSigner;
 import com.google.auth.oauth2.ServiceAccountCredentials;
 import com.google.cloud.BatchResult;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.ReadChannel;
 import com.google.cloud.WriteChannel;
 import com.google.cloud.storage.Acl;
@@ -247,9 +247,7 @@ public Page listBucketsWithSizeAndPrefix(String prefix) {
     // [START listBucketsWithSizeAndPrefix]
     Page buckets = storage.list(BucketListOption.pageSize(100),
         BucketListOption.prefix(prefix));
-    Iterator bucketIterator = buckets.iterateAll();
-    while (bucketIterator.hasNext()) {
-      Bucket bucket = bucketIterator.next();
+    for(Bucket bucket : buckets.iterateAll()) {
       // do something with the bucket
     }
     // [END listBucketsWithSizeAndPrefix]
@@ -266,9 +264,7 @@ public Page listBlobsWithDirectoryAndPrefix(String bucketName, String dire
     // [START listBlobsWithDirectoryAndPrefix]
     Page blobs = storage.list(bucketName, BlobListOption.currentDirectory(),
         BlobListOption.prefix(directory));
-    Iterator blobIterator = blobs.iterateAll();
-    while (blobIterator.hasNext()) {
-      Blob blob = blobIterator.next();
+    for(Blob blob : blobs.iterateAll()) {
       // do something with the blob
     }
     // [END listBlobsWithDirectoryAndPrefix]

From 832b4685bbaec19b5708c77f7280bf394014d3ca Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Tue, 11 Apr 2017 09:51:54 -0700
Subject: [PATCH 06/15] Address PR comments

---
 .../google/cloud/bigquery/QueryResult.java    |  2 +-
 .../main/java/com/google/cloud/AsyncPage.java | 54 -------------------
 .../java/com/google/cloud/AsyncPageImpl.java  |  1 +
 .../examples/logging/LoggingExample.java      |  2 -
 .../logging/snippets/LoggingSnippets.java     |  4 +-
 .../com/google/cloud/logging/Logging.java     |  2 +-
 .../com/google/cloud/logging/LoggingImpl.java |  2 +-
 7 files changed, 5 insertions(+), 62 deletions(-)
 delete mode 100644 google-cloud-core/src/main/java/com/google/cloud/AsyncPage.java

diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java
index 2dbd9e77f971..a79e321b9cb5 100644
--- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java
+++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java
@@ -143,7 +143,7 @@ public QueryResult getNextPage() {
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
-        .add("rows", this)
+        .add("rows", getValues())
         .add("cacheHit", cacheHit)
         .add("schema", schema)
         .add("totalBytesProcessed", totalBytesProcessed)
diff --git a/google-cloud-core/src/main/java/com/google/cloud/AsyncPage.java b/google-cloud-core/src/main/java/com/google/cloud/AsyncPage.java
deleted file mode 100644
index 038cc9fae1e7..000000000000
--- a/google-cloud-core/src/main/java/com/google/cloud/AsyncPage.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.cloud;
-
-import com.google.api.gax.core.ApiFuture;
-import com.google.api.gax.core.Page;
-
-/**
- * Interface for asynchronously consuming Google Cloud paginated results.
- *
- * 
Use {@code AsyncPage} to iterate through all values (also in next pages):
- * 
 {@code
- * AsyncPage page = ...; // get an AsyncPage instance
- * Iterator iterator = page.iterateAll();
- * while (iterator.hasNext()) {
- *   T value = iterator.next();
- *   // do something with value
- * }}

- *
- * 
Or handle pagination explicitly:
- * 
 {@code
- * AsyncPage page = ...; // get a AsyncPage instance
- * while (page != null) {
- *   for (T value : page.getValues()) {
- *     // do something with value
- *   }
- *   page = page.getNextPageAsync().get();
- * }}

- *
- * @param  the value type that the page holds
- */
-public interface AsyncPage extends Page {
-
-
-  /**
-   * Returns a {@link ApiFuture} object for the next page. {@link ApiFuture#get()} returns
-   * {@code null} if the last page has been reached.
-   */
-  ApiFuture> getNextPageAsync();
-}
diff --git a/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java b/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java
index 7d617c4e0fc2..c119f4f18e03 100644
--- a/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java
+++ b/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java
@@ -18,6 +18,7 @@
 
 import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.ApiFutures;
+import com.google.api.gax.core.AsyncPage;
 import com.google.api.gax.core.Page;
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.Uninterruptibles;
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java
index 71304538f305..dd8f416cfe34 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java
@@ -39,9 +39,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
-import sun.rmi.runtime.Log;
 
 /**
  * An example of using Stackdriver Logging.
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java
index 1f53fcbff44d..eecdd16f2750 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java
@@ -22,7 +22,7 @@
 
 package com.google.cloud.examples.logging.snippets;
 
-import com.google.cloud.AsyncPage;
+import com.google.api.gax.core.AsyncPage;
 import com.google.cloud.MonitoredResource;
 import com.google.cloud.MonitoredResourceDescriptor;
 import com.google.api.gax.core.Page;
@@ -42,12 +42,10 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import sun.rmi.runtime.Log;
 
 public class LoggingSnippets {
 
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java
index ebeaee3d03db..9ec047c2ec2e 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java
@@ -17,7 +17,7 @@
 package com.google.cloud.logging;
 
 import com.google.api.gax.core.ApiFuture;
-import com.google.cloud.AsyncPage;
+import com.google.api.gax.core.AsyncPage;
 import com.google.cloud.MonitoredResource;
 import com.google.cloud.MonitoredResourceDescriptor;
 import com.google.api.gax.core.Page;
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
index 7a1b1986a741..bb174c82f667 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
@@ -28,7 +28,7 @@
 import com.google.api.gax.core.ApiFunction;
 import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.ApiFutures;
-import com.google.cloud.AsyncPage;
+import com.google.api.gax.core.AsyncPage;
 import com.google.cloud.AsyncPageImpl;
 import com.google.cloud.BaseService;
 import com.google.cloud.MonitoredResource;

From 965b915f12448fb6a7e77a2afbca870e44294c76 Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Tue, 11 Apr 2017 10:02:40 -0700
Subject: [PATCH 07/15] Run google java formatter to remove imports

---
 .../test/java/com/google/cloud/bigquery/BigQueryImplTest.java | 1 -
 .../java/com/google/cloud/compute/NetworkInterfaceTest.java   | 1 -
 .../src/test/java/com/google/cloud/datastore/BaseKeyTest.java | 1 -
 .../com/google/cloud/examples/bigquery/BigQueryExample.java   | 1 -
 .../cloud/examples/bigquery/snippets/BigQuerySnippets.java    | 1 -
 .../cloud/examples/bigquery/snippets/DatasetSnippets.java     | 1 -
 .../examples/bigquery/snippets/InsertDataAndQueryTable.java   | 1 -
 .../cloud/examples/bigquery/snippets/TableSnippets.java       | 1 -
 .../com/google/cloud/examples/compute/ComputeExample.java     | 1 -
 .../cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java | 1 -
 .../com/google/cloud/examples/dns/snippets/DeleteZone.java    | 1 -
 .../examples/dns/snippets/ManipulateZonesAndRecordSets.java   | 1 -
 .../cloud/examples/logging/snippets/CreateAndListMetrics.java | 1 -
 .../cloud/examples/logging/snippets/CreateAndListSinks.java   | 1 -
 .../examples/logging/snippets/WriteAndListLogEntries.java     | 1 -
 .../resourcemanager/snippets/UpdateAndListProjects.java       | 1 -
 .../com/google/cloud/examples/storage/StorageExample.java     | 1 -
 .../storage/snippets/CreateAndListBucketsAndBlobs.java        | 1 -
 .../cloud/examples/storage/snippets/StorageSnippets.java      | 1 -
 .../cloud/examples/bigquery/snippets/ITBigQuerySnippets.java  | 4 ----
 .../google/cloud/language/spi/v1/LanguageServiceClient.java   | 1 -
 .../cloud/language/spi/v1/LanguageServiceClientTest.java      | 1 -
 .../main/java/com/google/cloud/logging/LoggingHandler.java    | 1 -
 .../cloud/logging/spi/v2/testing/LocalLoggingHelper.java      | 1 -
 .../google/cloud/monitoring/spi/v3/MetricServiceClient.java   | 1 -
 .../cloud/monitoring/spi/v3/MetricServiceClientTest.java      | 1 -
 .../src/main/java/com/google/cloud/spanner/Key.java           | 2 --
 .../com/google/cloud/speech/spi/v1beta1/SpeechClientTest.java | 1 -
 .../test/java/com/google/cloud/storage/StorageImplTest.java   | 1 -
 .../google/cloud/storage/testing/RemoteStorageHelperTest.java | 1 -
 .../java/com/google/cloud/translate/TranslateOptions.java     | 1 -
 31 files changed, 35 deletions(-)

diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
index 635d340ca8c5..239a132da11c 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
@@ -26,7 +26,6 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import com.google.api.gax.core.RetrySettings;
 import com.google.api.services.bigquery.model.ErrorProto;
 import com.google.api.services.bigquery.model.GetQueryResultsResponse;
 import com.google.api.services.bigquery.model.TableCell;
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/NetworkInterfaceTest.java b/google-cloud-compute/src/test/java/com/google/cloud/compute/NetworkInterfaceTest.java
index 2bb7fe96cafb..ddfd7f051b89 100644
--- a/google-cloud-compute/src/test/java/com/google/cloud/compute/NetworkInterfaceTest.java
+++ b/google-cloud-compute/src/test/java/com/google/cloud/compute/NetworkInterfaceTest.java
@@ -22,7 +22,6 @@
 import com.google.cloud.compute.NetworkInterface.AccessConfig;
 import com.google.common.collect.ImmutableList;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
index 512879c2bd90..e091d614fc7e 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
-import com.google.protobuf.InvalidProtocolBufferException;
 
 import org.junit.Test;
 
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java
index a22ab659fdd2..70ca02c58b75 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java
@@ -49,7 +49,6 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
index 2a2088a817fe..55c694369fe5 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
@@ -66,7 +66,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java
index f8dacfcde6c8..8e00dd044f75 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java
@@ -32,7 +32,6 @@
 import com.google.cloud.bigquery.Table;
 import com.google.cloud.bigquery.TimePartitioning;
 
-import java.util.Iterator;
 
 /**
  * This class contains a number of snippets for the {@link Dataset} interface.
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java
index 2b21900de895..9c6195fff5f8 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java
@@ -37,7 +37,6 @@
 import com.google.cloud.bigquery.TableInfo;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java
index a217b1b32477..e5a546d2a83c 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java
@@ -40,7 +40,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java
index 646adafe43c9..332b2735464b 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java
@@ -75,7 +75,6 @@
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java
index 6ef6e0cde4c2..cb2468759f33 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java
@@ -28,7 +28,6 @@
 import com.google.cloud.dns.RecordSet;
 import com.google.cloud.dns.Zone;
 
-import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 
 /**
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java
index c3e937e9629b..10cb36e58764 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java
@@ -28,7 +28,6 @@
 import com.google.cloud.dns.DnsOptions;
 import com.google.cloud.dns.RecordSet;
 
-import java.util.Iterator;
 
 /**
  * A snippet for Google Cloud DNS showing how to delete a zone. It also shows how to list and delete
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java
index 69cd62187525..f342a4000edf 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java
@@ -31,7 +31,6 @@
 import com.google.cloud.dns.Zone;
 import com.google.cloud.dns.ZoneInfo;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java
index 3bcb9ccad1a9..64c9811fbbec 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java
@@ -22,7 +22,6 @@
 import com.google.cloud.logging.Metric;
 import com.google.cloud.logging.MetricInfo;
 
-import java.util.Iterator;
 
 /**
  * A snippet for Stackdriver Logging showing how to create a metric. The snippet also shows how to
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java
index bd0b00a3772e..0ecf8320b67a 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java
@@ -23,7 +23,6 @@
 import com.google.cloud.logging.SinkInfo;
 import com.google.cloud.logging.SinkInfo.Destination.DatasetDestination;
 
-import java.util.Iterator;
 
 /**
  * A snippet for Stackdriver Logging showing how to create a sink to backs log entries to BigQuery.
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java
index 8b286c7b9742..9ed3aa133eb1 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java
@@ -25,7 +25,6 @@
 import com.google.cloud.logging.Payload.StringPayload;
 
 import java.util.Collections;
-import java.util.Iterator;
 
 /**
  * A snippet for Stackdriver Logging showing how to write a log entry. The snippet also shows how to
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java
index 71465e7ea886..479b960d7302 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java
@@ -26,7 +26,6 @@
 import com.google.cloud.resourcemanager.ResourceManager;
 import com.google.cloud.resourcemanager.ResourceManagerOptions;
 
-import java.util.Iterator;
 
 /**
  * A snippet for Google Cloud Resource Manager showing how to update a project and list all projects
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java
index ad7b982497cb..71b57c88d37c 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java
@@ -52,7 +52,6 @@
 import java.security.cert.CertificateException;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java
index 94fc02827dd8..e93f9b1e51f8 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java
@@ -30,7 +30,6 @@
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
 
-import java.util.Iterator;
 
 /**
  * A snippet for Google Cloud Storage showing how to create a bucket and a blob in it. The snippet
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java
index ce7bdbc8a462..ec37404d791c 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java
@@ -63,7 +63,6 @@
 import java.net.URL;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITBigQuerySnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITBigQuerySnippets.java
index 6749dd118560..98c8557567a2 100644
--- a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITBigQuerySnippets.java
+++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITBigQuerySnippets.java
@@ -53,12 +53,8 @@
 import org.junit.Test;
 import org.junit.rules.Timeout;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URISyntaxException;
-import java.nio.channels.Channels;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Iterator;
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceClient.java b/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceClient.java
index d36a394e2fc1..ef707a9e83ae 100644
--- a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceClient.java
+++ b/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceClient.java
@@ -24,7 +24,6 @@
 import com.google.cloud.language.v1.AnalyzeSyntaxRequest;
 import com.google.cloud.language.v1.AnalyzeSyntaxResponse;
 import com.google.cloud.language.v1.AnnotateTextRequest;
-import com.google.cloud.language.v1.AnnotateTextRequest.Features;
 import com.google.cloud.language.v1.AnnotateTextResponse;
 import com.google.cloud.language.v1.Document;
 import com.google.cloud.language.v1.EncodingType;
diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/LanguageServiceClientTest.java b/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/LanguageServiceClientTest.java
index 3d7fe8efa52d..fec41f7cce5b 100644
--- a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/LanguageServiceClientTest.java
+++ b/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/LanguageServiceClientTest.java
@@ -25,7 +25,6 @@
 import com.google.cloud.language.v1.AnalyzeSyntaxRequest;
 import com.google.cloud.language.v1.AnalyzeSyntaxResponse;
 import com.google.cloud.language.v1.AnnotateTextRequest;
-import com.google.cloud.language.v1.AnnotateTextRequest.Features;
 import com.google.cloud.language.v1.AnnotateTextResponse;
 import com.google.cloud.language.v1.Document;
 import com.google.cloud.language.v1.EncodingType;
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
index d82b68db74f3..61601a635690 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
@@ -26,7 +26,6 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.ErrorManager;
 import java.util.logging.Filter;
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/testing/LocalLoggingHelper.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/testing/LocalLoggingHelper.java
index cfd249c16644..676927a4e07a 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/testing/LocalLoggingHelper.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/testing/LocalLoggingHelper.java
@@ -14,7 +14,6 @@
 
 package com.google.cloud.logging.spi.v2.testing;
 
-import com.google.logging.v2.LoggingServiceV2Grpc;
 
 import io.grpc.ManagedChannel;
 import io.grpc.Server;
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java
index 312304ebcbdf..dc79300e6c70 100644
--- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java
+++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java
@@ -33,7 +33,6 @@
 import com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest;
 import com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse;
 import com.google.monitoring.v3.ListTimeSeriesRequest;
-import com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView;
 import com.google.monitoring.v3.ListTimeSeriesResponse;
 import com.google.monitoring.v3.MetricDescriptorName;
 import com.google.monitoring.v3.MonitoredResourceDescriptorName;
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java
index 27bae083fba1..4cccf7b79f1c 100644
--- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java
+++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java
@@ -35,7 +35,6 @@
 import com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest;
 import com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse;
 import com.google.monitoring.v3.ListTimeSeriesRequest;
-import com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView;
 import com.google.monitoring.v3.ListTimeSeriesResponse;
 import com.google.monitoring.v3.MetricDescriptorName;
 import com.google.monitoring.v3.MonitoredResourceDescriptorName;
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Key.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Key.java
index 01164277eec1..1f89e4c3f06e 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Key.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Key.java
@@ -21,9 +21,7 @@
 import com.google.cloud.ByteArray;
 import com.google.cloud.Date;
 import com.google.cloud.Timestamp;
-import com.google.common.base.Function;
 import com.google.common.base.Joiner;
-import com.google.common.collect.Iterables;
 import com.google.protobuf.ListValue;
 import com.google.protobuf.NullValue;
 import com.google.protobuf.Value;
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/SpeechClientTest.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/SpeechClientTest.java
index cc30143dc6de..e185edd8af6b 100644
--- a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/SpeechClientTest.java
+++ b/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/SpeechClientTest.java
@@ -25,7 +25,6 @@
 import com.google.cloud.speech.v1beta1.AsyncRecognizeResponse;
 import com.google.cloud.speech.v1beta1.RecognitionAudio;
 import com.google.cloud.speech.v1beta1.RecognitionConfig;
-import com.google.cloud.speech.v1beta1.RecognitionConfig.AudioEncoding;
 import com.google.cloud.speech.v1beta1.StreamingRecognizeRequest;
 import com.google.cloud.speech.v1beta1.StreamingRecognizeResponse;
 import com.google.cloud.speech.v1beta1.SyncRecognizeRequest;
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
index 397a167503ee..84628c7dba7f 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
@@ -31,7 +31,6 @@
 import com.google.auth.oauth2.ServiceAccountCredentials;
 import com.google.cloud.Page;
 import com.google.cloud.ReadChannel;
-import com.google.api.gax.core.RetrySettings;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.WriteChannel;
 import com.google.cloud.storage.Acl.Project;
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java
index 9244cb299628..7d465fd51a17 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java
@@ -39,7 +39,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java
index 98d083f3feba..859615797b06 100644
--- a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java
+++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java
@@ -17,7 +17,6 @@
 package com.google.cloud.translate;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.cloud.HttpTransportOptions;
 import com.google.cloud.ServiceDefaults;

From b3bf8e633ab6f78b1dc72f188cea7908f7db4d2e Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Tue, 11 Apr 2017 10:02:56 -0700
Subject: [PATCH 08/15] Fix error in contrib

---
 .../storage/contrib/nio/CloudStorageFileSystemProvider.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
index af5dfe8a38ec..71b45c8a282f 100644
--- a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
+++ b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
@@ -620,7 +620,7 @@ public DirectoryStream newDirectoryStream(Path dir, final Filter blobIterator = storage.list(cloudPath.bucket(),
         Storage.BlobListOption.prefix(prefix), Storage.BlobListOption.currentDirectory(),
-        Storage.BlobListOption.fields()).iterateAll();
+        Storage.BlobListOption.fields()).iterateAll().iterator();
     return new DirectoryStream() {
       @Override
       public Iterator iterator() {

From 773225b1829b1c13b3ef41e778d759de61c06557 Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Tue, 11 Apr 2017 10:14:36 -0700
Subject: [PATCH 09/15] Fix spacing around for loops

---
 google-cloud-dns/README.md                    |  2 +-
 google-cloud-examples/.classpath              | 31 +++++++++++++++++++
 .../examples/bigquery/BigQueryExample.java    | 10 +++---
 .../bigquery/snippets/BigQuerySnippets.java   | 20 ++++++------
 .../bigquery/snippets/DatasetSnippets.java    |  2 +-
 .../snippets/InsertDataAndQueryTable.java     |  2 +-
 .../bigquery/snippets/TableSnippets.java      |  2 +-
 .../examples/compute/ComputeExample.java      | 28 ++++++++---------
 .../snippets/CreateOrUpdateRecordSets.java    |  2 +-
 .../examples/dns/snippets/DeleteZone.java     |  2 +-
 .../ManipulateZonesAndRecordSets.java         | 10 +++---
 .../examples/logging/LoggingExample.java      |  8 ++---
 .../snippets/CreateAndListMetrics.java        |  2 +-
 .../logging/snippets/CreateAndListSinks.java  |  2 +-
 .../logging/snippets/LoggingSnippets.java     | 16 +++++-----
 .../snippets/WriteAndListLogEntries.java      |  2 +-
 .../snippets/UpdateAndListProjects.java       |  2 +-
 .../examples/storage/StorageExample.java      |  4 +--
 .../storage/snippets/BucketSnippets.java      |  2 +-
 .../CreateAndListBucketsAndBlobs.java         |  4 +--
 .../storage/snippets/StorageSnippets.java     |  4 +--
 21 files changed, 94 insertions(+), 63 deletions(-)
 create mode 100644 google-cloud-examples/.classpath

diff --git a/google-cloud-dns/README.md b/google-cloud-dns/README.md
index 74955f6faa38..7acfba7b06f2 100644
--- a/google-cloud-dns/README.md
+++ b/google-cloud-dns/README.md
@@ -143,7 +143,7 @@ and then add
 ```java
 // Print assigned name servers
 List nameServers = zone.getNameServers();
-for(String nameServer : nameServers) {
+for (String nameServer : nameServers) {
   System.out.println(nameServer);
 }
 ```
diff --git a/google-cloud-examples/.classpath b/google-cloud-examples/.classpath
new file mode 100644
index 000000000000..b2acffc95125
--- /dev/null
+++ b/google-cloud-examples/.classpath
@@ -0,0 +1,31 @@
+
+
+	
+		
+			
+			
+		
+	
+	
+		
+			
+			
+		
+	
+	
+		
+			
+		
+	
+	
+		
+			
+		
+	
+	
+		
+			
+		
+	
+	
+
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java
index 70ca02c58b75..b227315b8202 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java
@@ -172,7 +172,7 @@ Void parse(String... args) throws Exception {
   private static class ListDatasetsAction extends NoArgsAction {
     @Override
     public void run(BigQuery bigquery, Void arg) {
-      for(Dataset dataset : bigquery.listDatasets().iterateAll()) {
+      for (Dataset dataset : bigquery.listDatasets().iterateAll()) {
         System.out.println(dataset);
       }
     }
@@ -206,7 +206,7 @@ public String params() {
   private static class ListTablesAction extends DatasetAction {
     @Override
     public void run(BigQuery bigquery, DatasetId datasetId) {
-      for(Table table : bigquery.listTables(datasetId).iterateAll()) {
+      for (Table table : bigquery.listTables(datasetId).iterateAll()) {
         System.out.println(table);
       }
     }
@@ -314,7 +314,7 @@ public void run(BigQuery bigquery, TableId tableId) {
   private static class ListTableDataAction extends TableAction {
     @Override
     public void run(BigQuery bigquery, TableId tableId) {
-      for(List row : bigquery.listTableData(tableId).iterateAll()) {
+      for (List row : bigquery.listTableData(tableId).iterateAll()) {
         System.out.println(row);
       }
     }
@@ -348,7 +348,7 @@ public String params() {
   private static class ListJobsAction extends NoArgsAction {
     @Override
     public void run(BigQuery bigquery, Void arg) {
-      for(Job job : bigquery.listJobs().iterateAll()) {
+      for (Job job : bigquery.listJobs().iterateAll()) {
         System.out.println(job);
       }
     }
@@ -628,7 +628,7 @@ void run(BigQuery bigquery, QueryRequest queryRequest) throws Exception {
       }
       if (!queryResponse.hasErrors()) {
         System.out.println("Query succeeded. Results:");
-        for(List row : queryResponse.getResult().iterateAll()) {
+        for (List row : queryResponse.getResult().iterateAll()) {
           System.out.println(row);
         }
       } else {
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
index 55c694369fe5..dffe5728f1d9 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
@@ -139,7 +139,7 @@ public Table updateTable(String datasetName, String tableName, String newFriendl
   public Page listDatasets() {
     // [START listDatasets]
     Page datasets = bigquery.listDatasets(DatasetListOption.pageSize(100));
-    for(Dataset dataset : datasets.iterateAll()) {
+    for (Dataset dataset : datasets.iterateAll()) {
       // do something with the dataset
     }
     // [END listDatasets]
@@ -154,7 +154,7 @@ public Page listDatasets() {
   public Page listDatasets(String projectId) {
     // [START listDatasets]
     Page datasets = bigquery.listDatasets(projectId, DatasetListOption.pageSize(100));
-    for(Dataset dataset : datasets.iterateAll()) {
+    for (Dataset dataset : datasets.iterateAll()) {
       // do something with the dataset
     }
     // [END listDatasets]
@@ -243,7 +243,7 @@ public Boolean deleteTableFromId(String projectId, String datasetName, String ta
   public Page
 listTables(String datasetName) {
     // [START listTables]
     Page
 tables = bigquery.listTables(datasetName, TableListOption.pageSize(100));
-    for(Table table : tables.iterateAll()) {
+    for (Table table : tables.iterateAll()) {
       // do something with the table
     }
     // [END listTables]
@@ -261,7 +261,7 @@ public Page
 listTablesFromId(String projectId, String datasetName) {
     // [START listTablesFromId]
     DatasetId datasetId = DatasetId.of(projectId, datasetName);
     Page
 tables = bigquery.listTables(datasetId, TableListOption.pageSize(100));
-    for(Table table : tables.iterateAll()) {
+    for (Table table : tables.iterateAll()) {
       // do something with the table
     }
     // [END listTablesFromId]
@@ -443,7 +443,7 @@ public Page> listTableData(String datasetName, String tableName
     // [START listTableData]
     Page> tableData =
         bigquery.listTableData(datasetName, tableName, TableDataListOption.pageSize(100));
-    for(List row : tableData.iterateAll()) {
+    for (List row : tableData.iterateAll()) {
       // do something with the row
     }
     // [END listTableData]
@@ -461,7 +461,7 @@ public Page> listTableDataFromId(String datasetName, String tab
     TableId tableIdObject = TableId.of(datasetName, tableName);
     Page> tableData =
         bigquery.listTableData(tableIdObject, TableDataListOption.pageSize(100));
-    for(List row : tableData.iterateAll()) {
+    for (List row : tableData.iterateAll()) {
       // do something with the row
     }
     // [END listTableDataFromId]
@@ -494,7 +494,7 @@ public Job createJob(String query) {
   public Page listJobs() {
     // [START listJobs]
     Page jobs = bigquery.listJobs(JobListOption.pageSize(100));
-    for(Job job : jobs.iterateAll()) {
+    for (Job job : jobs.iterateAll()) {
       // do something with the job
     }
     // [END listJobs]
@@ -586,7 +586,7 @@ public QueryResponse runQuery(String query) throws InterruptedException {
       // handle errors
     }
     QueryResult result = response.getResult();
-    for(List row : result.iterateAll()) {
+    for (List row : result.iterateAll()) {
       // do something with the data
     }
     // [END runQuery]
@@ -614,7 +614,7 @@ public QueryResponse runQueryWithParameters(String query) throws InterruptedExce
       // handle errors
     }
     QueryResult result = response.getResult();
-    for(List row : result.iterateAll()) {
+    for (List row : result.iterateAll()) {
       // do something with the data
     }
     // [END runQueryWithParameters]
@@ -639,7 +639,7 @@ public QueryResponse queryResults(final String query) throws InterruptedExceptio
       // handle errors
     }
     QueryResult result = response.getResult();
-    for(List row : result.iterateAll()) {
+    for (List row : result.iterateAll()) {
       // do something with the data
     }
     // [END queryResults]
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java
index 8e00dd044f75..1d3725799580 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetSnippets.java
@@ -111,7 +111,7 @@ public boolean deleteDataset() {
   public Page
 list() {
      // [START list]
     Page
 tables = dataset.list();
-    for(Table table : tables.iterateAll()) {
+    for (Table table : tables.iterateAll()) {
       // do something with the table
     }
     // [END list]
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java
index 9c6195fff5f8..e71b0c3d542c 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java
@@ -92,7 +92,7 @@ public static void main(String... args) throws InterruptedException {
     }
     // Read rows
     System.out.println("Table rows:");
-    for(List row : queryResponse.getResult().iterateAll()) {
+    for (List row : queryResponse.getResult().iterateAll()) {
       System.out.println(row);
     }
   }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java
index e5a546d2a83c..d84bdee9865d 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/TableSnippets.java
@@ -170,7 +170,7 @@ public InsertAllResponse insertWithParams(String rowId1, String rowId2) {
   public Page> list() {
     // [START list]
     Page> page = table.list(TableDataListOption.pageSize(100));
-    for(List row : page.iterateAll()) {
+    for (List row : page.iterateAll()) {
       // do something with the row
     }
     // [END list]
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java
index 332b2735464b..3fb235278aab 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java
@@ -312,7 +312,7 @@ public void run(Compute compute, ZoneId zone) {
       } else {
         diskTypePage = compute.listDiskTypes();
       }
-      for(DiskType diskType : diskTypePage.iterateAll()) {
+      for (DiskType diskType : diskTypePage.iterateAll()) {
         System.out.println(diskType);
       }
     }
@@ -367,7 +367,7 @@ public void run(Compute compute, ZoneId zone) {
       } else {
         machineTypePage = compute.listMachineTypes();
       }
-      for(MachineType diskType : machineTypePage.iterateAll()) {
+      for (MachineType diskType : machineTypePage.iterateAll()) {
         System.out.println(diskType);
       }
     }
@@ -413,7 +413,7 @@ public String params() {
   private static class ListRegionsAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      for(Region region : compute.listRegions().iterateAll()) {
+      for (Region region : compute.listRegions().iterateAll()) {
         System.out.println(region);
       }
     }
@@ -459,7 +459,7 @@ public String params() {
   private static class ListZonesAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      for(Zone zone : compute.listZones().iterateAll()) {
+      for (Zone zone : compute.listZones().iterateAll()) {
         System.out.println(zone);
       }
     }
@@ -535,7 +535,7 @@ public String params() {
   private static class ListGlobalOperationsAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      for(Operation operation : compute.listGlobalOperations().iterateAll()) {
+      for (Operation operation : compute.listGlobalOperations().iterateAll()) {
         System.out.println(operation);
       }
     }
@@ -550,7 +550,7 @@ public void run(Compute compute, Void arg) {
   private static class ListZoneOperationsAction extends ComputeAction {
     @Override
     public void run(Compute compute, ZoneId zone) {
-      for(Operation operation : compute.listZoneOperations(zone.getZone()).iterateAll()) {
+      for (Operation operation : compute.listZoneOperations(zone.getZone()).iterateAll()) {
         System.out.println(operation);
       }
     }
@@ -583,7 +583,7 @@ public String params() {
   private static class ListRegionOperationsAction extends ComputeAction {
     @Override
     public void run(Compute compute, RegionId region) {
-      for(Operation operation : compute.listRegionOperations(region.getRegion()).iterateAll()) {
+      for (Operation operation : compute.listRegionOperations(region.getRegion()).iterateAll()) {
         System.out.println(operation);
       }
     }
@@ -774,7 +774,7 @@ public void run(Compute compute, RegionId region) {
       } else {
         addressPage = compute.listAddresses();
       }
-      for(Address address : addressPage.iterateAll()) {
+      for (Address address : addressPage.iterateAll()) {
         System.out.println(address);
       }
     }
@@ -884,7 +884,7 @@ public void run(Compute compute, AddressId address) throws InterruptedException
   private static class ListSnapshotsAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      for(Snapshot snapshot : compute.listSnapshots().iterateAll()) {
+      for (Snapshot snapshot : compute.listSnapshots().iterateAll()) {
         System.out.println(snapshot);
       }
     }
@@ -1007,7 +1007,7 @@ protected String params() {
   private static class ListImagesAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      for(Image image : compute.listImages().iterateAll()) {
+      for (Image image : compute.listImages().iterateAll()) {
         System.out.println(image);
       }
     }
@@ -1192,7 +1192,7 @@ public void run(Compute compute, DiskId disk) throws InterruptedException {
   private static class ListDisksAction extends OptionalZoneAction {
     @Override
     public void run(Compute compute, ZoneId zone) {
-      for(Disk disk : compute.listDisks().iterateAll()) {
+      for (Disk disk : compute.listDisks().iterateAll()) {
         System.out.println(disk);
       }
     }
@@ -1320,7 +1320,7 @@ protected String params() {
   private static class ListNetworksAction extends NoArgsAction {
     @Override
     public void run(Compute compute, Void arg) {
-      for(Network network : compute.listNetworks().iterateAll()) {
+      for (Network network : compute.listNetworks().iterateAll()) {
         System.out.println(network);
       }
     }
@@ -1485,7 +1485,7 @@ public void run(Compute compute, RegionId region) {
       } else {
         subnetworkPage = compute.listSubnetworks();
       }
-      for(Subnetwork subnetwork : subnetworkPage.iterateAll()) {
+      for (Subnetwork subnetwork : subnetworkPage.iterateAll()) {
         System.out.println(subnetwork);
       }
     }
@@ -1612,7 +1612,7 @@ public void run(Compute compute, ZoneId zone) {
       } else {
         instancePage = compute.listInstances();
       }
-      for(Instance instance : instancePage.iterateAll()) {
+      for (Instance instance : instancePage.iterateAll()) {
         System.out.println(instance);
       }
     }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java
index cb2468759f33..b8dceddf2c6d 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java
@@ -58,7 +58,7 @@ public static void main(String... args) {
 
     // Verify a www.. type A record does not exist yet.
     // If it does exist, we will overwrite it with our prepared record.
-    for(RecordSet current :  zone.listRecordSets().iterateAll()) {
+    for (RecordSet current :  zone.listRecordSets().iterateAll()) {
       if (toCreate.getName().equals(current.getName())
           && toCreate.getType().equals(current.getType())) {
         changeBuilder.delete(current);
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java
index 10cb36e58764..f68f16e4a1f7 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java
@@ -48,7 +48,7 @@ public static void main(String... args) {
 
     // Make a change for deleting the records
     ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.newBuilder();
-    for(RecordSet current : recordIterable) {
+    for (RecordSet current : recordIterable) {
       // SOA and NS records cannot be deleted
       if (!RecordSet.Type.SOA.equals(current.getType())
           && !RecordSet.Type.NS.equals(current.getType())) {
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java
index f342a4000edf..be1e5009e72f 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java
@@ -72,7 +72,7 @@ public static void main(String... args) {
     // Verify the type A record does not exist yet.
     // If it does exist, we will overwrite it with our prepared record.
     Page recordSetPage = zone.listRecordSets();
-    for(RecordSet current : recordSetPage.iterateAll()) {
+    for (RecordSet current : recordSetPage.iterateAll()) {
       if (toCreate.getName().equals(current.getName())
           && toCreate.getType().equals(current.getType())) {
         changeBuilder.delete(current);
@@ -95,26 +95,26 @@ public static void main(String... args) {
 
     // List all your zones
     int counter = 1;
-    for(Zone currentZone : dns.listZones().iterateAll()) {
+    for (Zone currentZone : dns.listZones().iterateAll()) {
       System.out.printf("#%d.: %s%n%n", counter, currentZone);
       counter++;
     }
 
     // List the record sets in a particular zone
     System.out.println(String.format("Record sets inside %s:", zone.getName()));
-    for(RecordSet recordSet : recordSetPage.iterateAll()) {
+    for (RecordSet recordSet : recordSetPage.iterateAll()) {
       System.out.println(recordSet);
     }
 
     // List the change requests applied to a particular zone
     System.out.println(String.format("The history of changes in %s:", zone.getName()));
-    for(ChangeRequest currentChangeRequest : zone.listChangeRequests().iterateAll()) {
+    for (ChangeRequest currentChangeRequest : zone.listChangeRequests().iterateAll()) {
       System.out.println(currentChangeRequest);
     }
 
     // Make a change for deleting the record sets
     changeBuilder = ChangeRequestInfo.newBuilder();
-    for(RecordSet current : recordSetPage.iterateAll()) {
+    for (RecordSet current : recordSetPage.iterateAll()) {
       // SOA and NS records cannot be deleted
       if (!RecordSet.Type.SOA.equals(current.getType())
           && !RecordSet.Type.NS.equals(current.getType())) {
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java
index dd8f416cfe34..f774fd38ec94 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java
@@ -172,7 +172,7 @@ Void parse(String... args) throws Exception {
   private static class ListMetricsAction extends NoArgsAction {
     @Override
     public void run(Logging logging, Void arg) {
-      for(Metric metric : logging.listMetrics().iterateAll()) {
+      for (Metric metric : logging.listMetrics().iterateAll()) {
         System.out.println(metric);
       }
     }
@@ -265,7 +265,7 @@ public String params() {
   private static class ListSinksAction extends NoArgsAction {
     @Override
     public void run(Logging logging, Void arg) {
-      for(Sink sink : logging.listSinks().iterateAll()) {
+      for (Sink sink : logging.listSinks().iterateAll()) {
         System.out.println(sink);
       }
     }
@@ -375,7 +375,7 @@ public String params() {
   private static class ListResourceDescriptorsAction extends NoArgsAction {
     @Override
     public void run(Logging logging, Void arg) {
-      for(MonitoredResourceDescriptor descriptor : logging.listMonitoredResourceDescriptors().iterateAll()) {
+      for (MonitoredResourceDescriptor descriptor : logging.listMonitoredResourceDescriptors().iterateAll()) {
         System.out.println(descriptor);
       }
     }
@@ -443,7 +443,7 @@ public void run(Logging logging, String filter) {
       } else {
         entryPage = logging.listLogEntries(EntryListOption.filter(filter));
       }
-      for(LogEntry entry : entryPage.iterateAll()) {
+      for (LogEntry entry : entryPage.iterateAll()) {
         System.out.println(entry);
       }
     }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java
index 64c9811fbbec..491d366cfcc3 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java
@@ -45,7 +45,7 @@ public static void main(String... args) throws Exception {
 
       // List metrics
       Page metrics = logging.listMetrics();
-      for(Metric metric : metrics.iterateAll()) {
+      for (Metric metric : metrics.iterateAll()) {
         System.out.println(metric);
       }
     }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java
index 0ecf8320b67a..36fcb9b776d5 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListSinks.java
@@ -45,7 +45,7 @@ public static void main(String... args) throws Exception {
 
       // List sinks
       Page sinks = logging.listSinks();
-      for(Sink sink : sinks.iterateAll()) {
+      for (Sink sink : sinks.iterateAll()) {
         System.out.println(sink);
       }
     }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java
index eecdd16f2750..943d2e7c0c22 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java
@@ -164,7 +164,7 @@ public Sink getSinkAsync(String sinkName) throws ExecutionException, Interrupted
   public Page listSinks() {
     // [START listSinks]
     Page sinks = logging.listSinks(ListOption.pageSize(100));
-    for(Sink sink : sinks.iterateAll()) {
+    for (Sink sink : sinks.iterateAll()) {
       // do something with the sink
     }
     // [END listSinks]
@@ -180,7 +180,7 @@ public Page listSinksAsync() throws ExecutionException, InterruptedExcepti
     Future> future = logging.listSinksAsync(ListOption.pageSize(100));
     // ...
     AsyncPage sinks = future.get();
-    for(Sink sink : sinks.iterateAll()) {
+    for (Sink sink : sinks.iterateAll()) {
       // do something with the sink
     }
     // [END listSinksAsync]
@@ -267,7 +267,7 @@ public Page listMonitoredResourceDescriptors() {
     // [START listMonitoredResourceDescriptors]
     Page descriptors =
         logging.listMonitoredResourceDescriptors(ListOption.pageSize(100));
-    for(MonitoredResourceDescriptor descriptor : descriptors.iterateAll()) {
+    for (MonitoredResourceDescriptor descriptor : descriptors.iterateAll()) {
       // do something with the descriptor
     }
     // [END listMonitoredResourceDescriptors]
@@ -285,7 +285,7 @@ public Page listMonitoredResourceDescriptorsAsync()
         logging.listMonitoredResourceDescriptorsAsync(ListOption.pageSize(100));
     // ...
     AsyncPage descriptors = future.get();
-    for(MonitoredResourceDescriptor descriptor : descriptors.iterateAll()) {
+    for (MonitoredResourceDescriptor descriptor : descriptors.iterateAll()) {
       // do something with the descriptor
     }
     // [END listMonitoredResourceDescriptorsAsync]
@@ -393,7 +393,7 @@ public Metric getMetricAsync(String metricName) throws ExecutionException, Inter
   public Page listMetrics() {
     // [START listMetrics]
     Page metrics = logging.listMetrics(ListOption.pageSize(100));
-    for(Metric metric : metrics.iterateAll()) {
+    for (Metric metric : metrics.iterateAll()) {
       // do something with the metric
     }
     // [END listMetrics]
@@ -409,7 +409,7 @@ public Page listMetricsAsync() throws ExecutionException, InterruptedExc
     Future> future = logging.listMetricsAsync(ListOption.pageSize(100));
     // ...
     AsyncPage metrics = future.get();
-    for(Metric metric : metrics.iterateAll()) {
+    for (Metric metric : metrics.iterateAll()) {
       // do something with the metric
     }
     // [END listMetricsAsync]
@@ -500,7 +500,7 @@ public Future writeAsync(String logName) {
   public Page listLogEntries(String filter) {
     // [START listLogEntries]
     Page entries = logging.listLogEntries(EntryListOption.filter(filter));
-    for(LogEntry entry : entries.iterateAll()) {
+    for (LogEntry entry : entries.iterateAll()) {
       // do something with the entry
     }
     // [END listLogEntries]
@@ -519,7 +519,7 @@ public Page listLogEntriesAsync(String filter)
         logging.listLogEntriesAsync(EntryListOption.filter(filter));
     // ...
     AsyncPage entries = future.get();
-    for(LogEntry entry : entries.iterateAll()) {
+    for (LogEntry entry : entries.iterateAll()) {
       // do something with the entry
     }
     // [END listLogEntriesAsync]
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java
index 9ed3aa133eb1..ef1cd586ff55 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java
@@ -52,7 +52,7 @@ public static void main(String... args) throws Exception {
       // List log entries
       Page entries = logging.listLogEntries(
           EntryListOption.filter("logName=projects/" + options.getProjectId() + "/logs/test-log"));
-      for(LogEntry logEntry : entries.iterateAll()) {
+      for (LogEntry logEntry : entries.iterateAll()) {
         System.out.println(logEntry);
       }
     }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java
index 479b960d7302..8b0d2cb7e9ea 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java
@@ -53,7 +53,7 @@ public static void main(String... args) {
 
     // List all the projects you have permission to view.
     System.out.println("Projects I can view:");
-    for(Project currentProject : resourceManager.list().iterateAll()) {
+    for (Project currentProject : resourceManager.list().iterateAll()) {
       System.out.println(currentProject.getProjectId());
     }
   }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java
index 71b57c88d37c..350b7d10d45f 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java
@@ -267,7 +267,7 @@ String parse(String... args) {
     public void run(Storage storage, String bucketName) {
       if (bucketName == null) {
         // list buckets
-        for(Bucket bucket : storage.list().iterateAll()) {
+        for (Bucket bucket : storage.list().iterateAll()) {
           System.out.println(bucket);
         }
       } else {
@@ -277,7 +277,7 @@ public void run(Storage storage, String bucketName) {
           System.out.println("No such bucket");
           return;
         }
-        for(Blob blob : bucket.list().iterateAll()) {
+        for (Blob blob : bucket.list().iterateAll()) {
           System.out.println(blob);
         }
       }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/BucketSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/BucketSnippets.java
index 3dae129d80f5..6ce7254e63b3 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/BucketSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/BucketSnippets.java
@@ -115,7 +115,7 @@ public boolean delete() {
   public Page listBlobs() {
     // [START listBlobs]
     Page blobs = bucket.list();
-    for(Blob blob : blobs.iterateAll()) {
+    for (Blob blob : blobs.iterateAll()) {
       // do something with the blob
     }
     // [END listBlobs]
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java
index e93f9b1e51f8..a71158cc48de 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java
@@ -54,13 +54,13 @@ public static void main(String... args) {
 
     // List all your buckets
     System.out.println("My buckets:");
-    for(Bucket currentBucket : storage.list().iterateAll()) {
+    for (Bucket currentBucket : storage.list().iterateAll()) {
       System.out.println(currentBucket);
     }
 
     // List the blobs in a particular bucket
     System.out.println("My blobs:");
-    for(Blob currentBlob : bucket.list().iterateAll()) {
+    for (Blob currentBlob : bucket.list().iterateAll()) {
       System.out.println(currentBlob);
     }
   }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java
index ec37404d791c..9833d54a0aad 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java
@@ -246,7 +246,7 @@ public Page listBucketsWithSizeAndPrefix(String prefix) {
     // [START listBucketsWithSizeAndPrefix]
     Page buckets = storage.list(BucketListOption.pageSize(100),
         BucketListOption.prefix(prefix));
-    for(Bucket bucket : buckets.iterateAll()) {
+    for (Bucket bucket : buckets.iterateAll()) {
       // do something with the bucket
     }
     // [END listBucketsWithSizeAndPrefix]
@@ -263,7 +263,7 @@ public Page listBlobsWithDirectoryAndPrefix(String bucketName, String dire
     // [START listBlobsWithDirectoryAndPrefix]
     Page blobs = storage.list(bucketName, BlobListOption.currentDirectory(),
         BlobListOption.prefix(directory));
-    for(Blob blob : blobs.iterateAll()) {
+    for (Blob blob : blobs.iterateAll()) {
       // do something with the blob
     }
     // [END listBlobsWithDirectoryAndPrefix]

From 4347734031830054c8ff686a6a1008a687231f43 Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Tue, 11 Apr 2017 10:24:55 -0700
Subject: [PATCH 10/15] Update core tests

---
 .../src/test/java/com/google/cloud/AsyncPageImplTest.java  | 7 ++++---
 .../src/test/java/com/google/cloud/PageImplTest.java       | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/google-cloud-core/src/test/java/com/google/cloud/AsyncPageImplTest.java b/google-cloud-core/src/test/java/com/google/cloud/AsyncPageImplTest.java
index ea1717583dfb..a28536c91511 100644
--- a/google-cloud-core/src/test/java/com/google/cloud/AsyncPageImplTest.java
+++ b/google-cloud-core/src/test/java/com/google/cloud/AsyncPageImplTest.java
@@ -20,6 +20,7 @@
 
 import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.ApiFutures;
+import com.google.api.gax.core.AsyncPage;
 import com.google.common.collect.ImmutableList;
 
 import org.junit.Test;
@@ -62,7 +63,7 @@ public void testPage() {
     AsyncPageImpl.NextPageFetcher fetcher = new TestPageFetcher(nextResult);
     AsyncPageImpl result = new AsyncPageImpl<>(fetcher, "c", VALUES1);
     assertEquals(nextResult, result.getNextPage());
-    assertEquals("c", result.getNextPageCursor());
+    assertEquals("c", result.getNextPageToken());
     assertEquals(VALUES1, result.getValues());
   }
 
@@ -73,7 +74,7 @@ public void testPageAsync() throws ExecutionException, InterruptedException {
     AsyncPageImpl.NextPageFetcher fetcher = new TestPageFetcher(nextResult);
     AsyncPageImpl result = new AsyncPageImpl<>(fetcher, "c", VALUES1);
     assertEquals(nextResult, result.getNextPageAsync().get());
-    assertEquals("c", result.getNextPageCursor());
+    assertEquals("c", result.getNextPageToken());
     assertEquals(VALUES1, result.getValues());
   }
 
@@ -96,7 +97,7 @@ public void testAsyncPageAndIterateAll() throws ExecutionException, InterruptedE
     AsyncPageImpl.NextPageFetcher fetcher1 = new TestPageFetcher(nextResult1);
     AsyncPageImpl result = new AsyncPageImpl<>(fetcher1, "c1", VALUES1);
     assertEquals(nextResult1, result.getNextPageAsync().get());
-    assertEquals("c1", result.getNextPageCursor());
+    assertEquals("c1", result.getNextPageToken());
     assertEquals(VALUES1, result.getValues());
     assertEquals(SOME_VALUES, ImmutableList.copyOf(result.getNextPageAsync().get().iterateAll()));
   }
diff --git a/google-cloud-core/src/test/java/com/google/cloud/PageImplTest.java b/google-cloud-core/src/test/java/com/google/cloud/PageImplTest.java
index fb1d2c209cc2..a5ffadf4d6eb 100644
--- a/google-cloud-core/src/test/java/com/google/cloud/PageImplTest.java
+++ b/google-cloud-core/src/test/java/com/google/cloud/PageImplTest.java
@@ -18,6 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.api.gax.core.Page;
 import com.google.common.collect.ImmutableList;
 
 import org.junit.Test;
@@ -52,7 +53,7 @@ public void testPage() {
     PageImpl.NextPageFetcher fetcher = new TestPageFetcher(nextResult);
     PageImpl result = new PageImpl<>(fetcher, "c", VALUES);
     assertEquals(nextResult, result.getNextPage());
-    assertEquals("c", result.getNextPageCursor());
+    assertEquals("c", result.getNextPageToken());
     assertEquals(VALUES, result.getValues());
   }
 

From 1190de40470821603630335db6ed82e2f27b6a03 Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Tue, 11 Apr 2017 10:25:30 -0700
Subject: [PATCH 11/15] Update bigquery, compute, dns tests

---
 .../cloud/bigquery/BigQueryImplTest.java      |  40 ++--
 .../google/cloud/bigquery/DatasetTest.java    |   6 +-
 .../cloud/bigquery/QueryResultTest.java       |   6 +-
 .../com/google/cloud/bigquery/TableTest.java  |   2 +-
 .../cloud/bigquery/it/ITBigQueryTest.java     |   4 +-
 .../google/cloud/compute/ComputeImplTest.java | 218 +++++++++---------
 .../cloud/compute/it/ITComputeTest.java       |  88 +++----
 .../com/google/cloud/dns/DnsBatchTest.java    |   8 +-
 .../com/google/cloud/dns/DnsImplTest.java     |   2 +-
 .../java/com/google/cloud/dns/ZoneTest.java   |   2 +-
 .../com/google/cloud/dns/it/ITDnsTest.java    |  78 +++----
 11 files changed, 227 insertions(+), 227 deletions(-)

diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
index 239a132da11c..c4c15926f702 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
@@ -32,7 +32,7 @@
 import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
 import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
 import com.google.api.services.bigquery.model.TableRow;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.WriteChannel;
 import com.google.cloud.bigquery.InsertAllRequest.RowToInsert;
@@ -396,7 +396,7 @@ public void testListDatasets() {
     EasyMock.expect(bigqueryRpcMock.listDatasets(PROJECT, EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(bigqueryRpcMock);
     Page page = bigquery.listDatasets();
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(
         datasetList.toArray(), Iterables.toArray(page.getValues(), DatasetInfo.class));
   }
@@ -414,7 +414,7 @@ public void testListDatasetsWithProjects() {
         .andReturn(result);
     EasyMock.replay(bigqueryRpcMock);
     Page page = bigquery.listDatasets(OTHER_PROJECT);
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(
         datasetList.toArray(), Iterables.toArray(page.getValues(), DatasetInfo.class));
   }
@@ -428,7 +428,7 @@ public void testListEmptyDatasets() {
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.getService();
     Page page = bigquery.listDatasets();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(
         ImmutableList.of().toArray(), Iterables.toArray(page.getValues(), Dataset.class));
   }
@@ -446,7 +446,7 @@ public void testListDatasetsWithOptions() {
     EasyMock.replay(bigqueryRpcMock);
     Page page =
         bigquery.listDatasets(DATASET_LIST_ALL, DATASET_LIST_PAGE_TOKEN, DATASET_LIST_PAGE_SIZE);
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(
         datasetList.toArray(), Iterables.toArray(page.getValues(), DatasetInfo.class));
   }
@@ -617,7 +617,7 @@ public void testListTables() {
         .andReturn(result);
     EasyMock.replay(bigqueryRpcMock);
     Page
 page = bigquery.listTables(DATASET);
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(tableList.toArray(), Iterables.toArray(page.getValues(), Table.class));
   }
 
@@ -634,7 +634,7 @@ public void testListTablesFromDatasetId() {
         .andReturn(result);
     EasyMock.replay(bigqueryRpcMock);
     Page
 page = bigquery.listTables(DatasetId.of(DATASET));
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(tableList.toArray(), Iterables.toArray(page.getValues(), Table.class));
   }
 
@@ -650,7 +650,7 @@ public void testListTablesFromDatasetIdWithProject() {
         .andReturn(result);
     EasyMock.replay(bigqueryRpcMock);
     Page
 page = bigquery.listTables(DatasetId.of(OTHER_PROJECT, DATASET));
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(tableList.toArray(), Iterables.toArray(page.getValues(), Table.class));
   }
 
@@ -667,7 +667,7 @@ public void testListTablesWithOptions() {
         .andReturn(result);
     EasyMock.replay(bigqueryRpcMock);
     Page
 page = bigquery.listTables(DATASET, TABLE_LIST_PAGE_SIZE, TABLE_LIST_PAGE_TOKEN);
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(tableList.toArray(), Iterables.toArray(page.getValues(), Table.class));
   }
 
@@ -831,7 +831,7 @@ public void testListTableData() {
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.getService();
     Page> page = bigquery.listTableData(DATASET, TABLE);
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(TABLE_DATA.toArray(), Iterables.toArray(page.getValues(), List.class));
   }
 
@@ -842,7 +842,7 @@ public void testListTableDataFromTableId() {
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.getService();
     Page> page = bigquery.listTableData(TableId.of(DATASET, TABLE));
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(TABLE_DATA.toArray(), Iterables.toArray(page.getValues(), List.class));
   }
 
@@ -854,7 +854,7 @@ public void testListTableDataFromTableIdWithProject() {
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.getService();
     Page> page = bigquery.listTableData(tableId);
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(TABLE_DATA.toArray(), Iterables.toArray(page.getValues(), List.class));
   }
 
@@ -871,7 +871,7 @@ public void testListTableDataWithOptions() {
             TABLE_DATA_LIST_PAGE_SIZE,
             TABLE_DATA_LIST_PAGE_TOKEN,
             TABLE_DATA_LIST_START_INDEX);
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(TABLE_DATA.toArray(), Iterables.toArray(page.getValues(), List.class));
   }
 
@@ -1015,7 +1015,7 @@ public com.google.api.services.bigquery.model.Job apply(Job job) {
     EasyMock.expect(bigqueryRpcMock.listJobs(PROJECT, EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(bigqueryRpcMock);
     Page page = bigquery.listJobs();
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(jobList.toArray(), Iterables.toArray(page.getValues(), Job.class));
   }
 
@@ -1042,7 +1042,7 @@ public com.google.api.services.bigquery.model.Job apply(Job job) {
     Page page =
         bigquery.listJobs(
             JOB_LIST_ALL_USERS, JOB_LIST_STATE_FILTER, JOB_LIST_PAGE_TOKEN, JOB_LIST_PAGE_SIZE);
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(jobList.toArray(), Iterables.toArray(page.getValues(), Job.class));
   }
 
@@ -1069,7 +1069,7 @@ public com.google.api.services.bigquery.model.Job apply(Job job) {
         .andReturn(result);
     EasyMock.replay(bigqueryRpcMock);
     Page page = bigquery.listJobs(JOB_LIST_OPTION_FIELD);
-    assertEquals(CURSOR, page.getNextPageCursor());
+    assertEquals(CURSOR, page.getNextPageToken());
     assertArrayEquals(jobList.toArray(), Iterables.toArray(page.getValues(), Job.class));
     String selector = (String) capturedOptions.getValue().get(JOB_OPTION_FIELDS.getRpcOption());
     assertTrue(selector.contains("nextPageToken,jobs("));
@@ -1156,7 +1156,7 @@ public void testQueryRequestCompleted() {
       assertEquals(false, row.get(0).getBooleanValue());
       assertEquals(1L, row.get(1).getLongValue());
     }
-    assertEquals(CURSOR, response.getResult().getNextPageCursor());
+    assertEquals(CURSOR, response.getResult().getNextPageToken());
   }
 
   @Test
@@ -1190,7 +1190,7 @@ public void testGetQueryResults() {
       assertEquals(false, row.get(0).getBooleanValue());
       assertEquals(1L, row.get(1).getLongValue());
     }
-    assertEquals(CURSOR, response.getResult().getNextPageCursor());
+    assertEquals(CURSOR, response.getResult().getNextPageToken());
   }
 
   @Test
@@ -1224,7 +1224,7 @@ public void testGetQueryResultsWithProject() {
       assertEquals(false, row.get(0).getBooleanValue());
       assertEquals(1L, row.get(1).getLongValue());
     }
-    assertEquals(CURSOR, response.getResult().getNextPageCursor());
+    assertEquals(CURSOR, response.getResult().getNextPageToken());
   }
 
   @Test
@@ -1262,7 +1262,7 @@ public void testGetQueryResultsWithOptions() {
       assertEquals(false, row.get(0).getBooleanValue());
       assertEquals(1L, row.get(1).getLongValue());
     }
-    assertEquals(CURSOR, response.getResult().getNextPageCursor());
+    assertEquals(CURSOR, response.getResult().getNextPageToken());
   }
 
   @Test
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java
index 37dc098e5e9e..453767c62671 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java
@@ -30,7 +30,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.PageImpl;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -253,7 +253,7 @@ public void testList() throws Exception {
     Page
 tablePage = dataset.list();
     assertArrayEquals(tableResults.toArray(),
         Iterables.toArray(tablePage.getValues(), Table.class));
-    assertEquals(expectedPage.getNextPageCursor(), tablePage.getNextPageCursor());
+    assertEquals(expectedPage.getNextPageToken(), tablePage.getNextPageToken());
   }
 
   @Test
@@ -272,7 +272,7 @@ public void testListWithOptions() throws Exception {
     Page
 tablePage = dataset.list(BigQuery.TableListOption.pageSize(10L));
     assertArrayEquals(tableResults.toArray(),
         Iterables.toArray(tablePage.getValues(), Table.class));
-    assertEquals(expectedPage.getNextPageCursor(), tablePage.getNextPageCursor());
+    assertEquals(expectedPage.getNextPageToken(), tablePage.getNextPageToken());
   }
 
   @Test
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryResultTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryResultTest.java
index a102a1c2fa77..e468854afc0f 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryResultTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryResultTest.java
@@ -64,13 +64,13 @@ public void testBuilder() {
     assertEquals(TOTAL_ROWS, QUERY_RESULT.getTotalRows());
     assertEquals(TOTAL_BYTES_PROCESSED, QUERY_RESULT.getTotalBytesProcessed());
     assertEquals(CACHE_HIT, QUERY_RESULT.cacheHit());
-    assertEquals(CURSOR, QUERY_RESULT.getNextPageCursor());
+    assertEquals(CURSOR, QUERY_RESULT.getNextPageToken());
     assertEquals(null, QUERY_RESULT.getNextPage());
     assertEquals(null, QUERY_RESULT_INCOMPLETE.getSchema());
     assertEquals(0L, QUERY_RESULT_INCOMPLETE.getTotalRows());
     assertEquals(TOTAL_BYTES_PROCESSED, QUERY_RESULT_INCOMPLETE.getTotalBytesProcessed());
     assertEquals(false, QUERY_RESULT_INCOMPLETE.cacheHit());
-    assertEquals(null, QUERY_RESULT_INCOMPLETE.getNextPageCursor());
+    assertEquals(null, QUERY_RESULT_INCOMPLETE.getNextPageToken());
     assertEquals(null, QUERY_RESULT_INCOMPLETE.getNextPage());
   }
 
@@ -84,7 +84,7 @@ public void testEquals() {
   private void compareQueryResult(QueryResult expected, QueryResult value) {
     assertEquals(expected, value);
     assertEquals(expected.getNextPage(), value.getNextPage());
-    assertEquals(expected.getNextPageCursor(), value.getNextPageCursor());
+    assertEquals(expected.getNextPageToken(), value.getNextPageToken());
     assertEquals(expected.getValues(), value.getValues());
     assertEquals(expected.getSchema(), value.getSchema());
     assertEquals(expected.getTotalRows(), value.getTotalRows());
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java
index 015eb36203fe..f011c671d07a 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java
@@ -28,7 +28,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.PageImpl;
 import com.google.cloud.bigquery.InsertAllRequest.RowToInsert;
 import com.google.common.collect.ImmutableList;
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
index e2e201d77cf1..4a381fb3932f 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
@@ -24,7 +24,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.WaitForOption;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQuery.DatasetField;
@@ -249,7 +249,7 @@ public static void afterClass() throws ExecutionException, InterruptedException
   @Test
   public void testListDatasets() {
     Page datasets = bigquery.listDatasets("bigquery-public-data");
-    Iterator iterator = datasets.iterateAll();
+    Iterator iterator = datasets.iterateAll().iterator();
     Set datasetNames = new HashSet<>();
     while (iterator.hasNext()) {
       datasetNames.add(iterator.next().getDatasetId().getDataset());
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/ComputeImplTest.java b/google-cloud-compute/src/test/java/com/google/cloud/compute/ComputeImplTest.java
index 6591ccfc4289..fbf635bb01f2 100644
--- a/google-cloud-compute/src/test/java/com/google/cloud/compute/ComputeImplTest.java
+++ b/google-cloud-compute/src/test/java/com/google/cloud/compute/ComputeImplTest.java
@@ -25,7 +25,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.compute.NetworkInterface.AccessConfig;
 import com.google.cloud.compute.spi.v1.ComputeRpc;
@@ -622,7 +622,7 @@ public void testListDiskTypes() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDiskTypes(DISK_TYPE_ID.getZone());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskTypeList.toArray(), Iterables.toArray(page.getValues(), DiskType.class));
   }
 
@@ -645,10 +645,10 @@ public void testListDiskTypesNextPage() {
         .andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDiskTypes(DISK_TYPE_ID.getZone());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskTypeList.toArray(), Iterables.toArray(page.getValues(), DiskType.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextDiskTypeList.toArray(),
         Iterables.toArray(page.getValues(), DiskType.class));
   }
@@ -664,7 +664,7 @@ public void testListEmptyDiskTypes() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page page = compute.listDiskTypes(DISK_TYPE_ID.getZone());
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(diskTypes.toArray(), Iterables.toArray(page.getValues(), DiskType.class));
   }
 
@@ -680,7 +680,7 @@ public void testListDiskTypesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDiskTypes(DISK_TYPE_ID.getZone(), DISK_TYPE_LIST_PAGE_SIZE,
         DISK_TYPE_LIST_PAGE_TOKEN, DISK_TYPE_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskTypeList.toArray(), Iterables.toArray(page.getValues(), DiskType.class));
   }
 
@@ -694,7 +694,7 @@ public void testAggregatedListDiskTypes() {
     EasyMock.expect(computeRpcMock.listDiskTypes(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDiskTypes();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskTypeList.toArray(), Iterables.toArray(page.getValues(), DiskType.class));
   }
 
@@ -715,10 +715,10 @@ public void testAggregatedListDiskTypesNextPage() {
     EasyMock.expect(computeRpcMock.listDiskTypes(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDiskTypes();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskTypeList.toArray(), Iterables.toArray(page.getValues(), DiskType.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextDiskTypeList.toArray(),
         Iterables.toArray(page.getValues(), DiskType.class));
   }
@@ -733,7 +733,7 @@ public void testAggregatedListEmptyDiskTypes() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page page = compute.listDiskTypes();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(diskTypes.toArray(), Iterables.toArray(page.getValues(), DiskType.class));
   }
 
@@ -748,7 +748,7 @@ public void testAggregatedListDiskTypesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDiskTypes(DISK_TYPE_AGGREGATED_LIST_PAGE_SIZE,
         DISK_TYPE_AGGREGATED_LIST_PAGE_TOKEN, DISK_TYPE_AGGREGATED_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskTypeList.toArray(), Iterables.toArray(page.getValues(), DiskType.class));
   }
 
@@ -819,7 +819,7 @@ public void testListMachineTypes() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listMachineTypes(MACHINE_TYPE_ID.getZone());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(machineTypeList.toArray(), Iterables.toArray(page.getValues(),
         MachineType.class));
   }
@@ -845,11 +845,11 @@ public void testListMachineTypesNextPage() {
         .andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listMachineTypes(MACHINE_TYPE_ID.getZone());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(machineTypeList.toArray(),
         Iterables.toArray(page.getValues(), MachineType.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextMachineTypeList.toArray(),
         Iterables.toArray(page.getValues(), MachineType.class));
   }
@@ -867,7 +867,7 @@ public void testListEmptyMachineTypes() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page page = compute.listMachineTypes(MACHINE_TYPE_ID.getZone());
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(machineTypes.toArray(),
         Iterables.toArray(page.getValues(), MachineType.class));
   }
@@ -886,7 +886,7 @@ public void testListMachineTypesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listMachineTypes(MACHINE_TYPE_ID.getZone(),
         MACHINE_TYPE_LIST_PAGE_SIZE, MACHINE_TYPE_LIST_PAGE_TOKEN, MACHINE_TYPE_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(machineTypeList.toArray(),
         Iterables.toArray(page.getValues(), MachineType.class));
   }
@@ -902,7 +902,7 @@ public void testAggregatedListMachineTypes() {
     EasyMock.expect(computeRpcMock.listMachineTypes(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listMachineTypes();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(machineTypeList.toArray(), Iterables.toArray(page.getValues(),
         MachineType.class));
   }
@@ -926,11 +926,11 @@ public void testAggregatedListMachineTypesNextPage() {
     EasyMock.expect(computeRpcMock.listMachineTypes(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listMachineTypes();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(machineTypeList.toArray(),
         Iterables.toArray(page.getValues(), MachineType.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextMachineTypeList.toArray(),
         Iterables.toArray(page.getValues(), MachineType.class));
   }
@@ -947,7 +947,7 @@ public void testAggregatedListEmptyMachineTypes() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page page = compute.listMachineTypes();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(machineTypes.toArray(),
         Iterables.toArray(page.getValues(), MachineType.class));
   }
@@ -965,7 +965,7 @@ public void testAggregatedListMachineTypesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listMachineTypes(MACHINE_TYPE_AGGREGATED_LIST_PAGE_SIZE,
         MACHINE_TYPE_AGGREGATED_LIST_PAGE_TOKEN, MACHINE_TYPE_AGGREGATED_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(machineTypeList.toArray(),
         Iterables.toArray(page.getValues(), MachineType.class));
   }
@@ -1015,7 +1015,7 @@ public void testListRegions() {
     EasyMock.expect(computeRpcMock.listRegions(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listRegions();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(regionList.toArray(), Iterables.toArray(page.getValues(), Region.class));
   }
 
@@ -1035,10 +1035,10 @@ public void testListRegionsNextPage() {
     EasyMock.expect(computeRpcMock.listRegions(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listRegions();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(regionList.toArray(), Iterables.toArray(page.getValues(), Region.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextRegionList.toArray(), Iterables.toArray(page.getValues(), Region.class));
   }
 
@@ -1052,7 +1052,7 @@ public void testListEmptyRegions() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page page = compute.listRegions();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(regions.toArray(), Iterables.toArray(page.getValues(), Region.class));
   }
 
@@ -1067,7 +1067,7 @@ public void testListRegionsWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listRegions(REGION_LIST_PAGE_SIZE, REGION_LIST_PAGE_TOKEN,
         REGION_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(regionList.toArray(), Iterables.toArray(page.getValues(), Region.class));
   }
 
@@ -1115,7 +1115,7 @@ public void testListZones() {
     EasyMock.expect(computeRpcMock.listZones(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listZones();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(zoneList.toArray(), Iterables.toArray(page.getValues(), Zone.class));
   }
 
@@ -1135,10 +1135,10 @@ public void testListZonesNextPage() {
     EasyMock.expect(computeRpcMock.listZones(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listZones();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(zoneList.toArray(), Iterables.toArray(page.getValues(), Zone.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextZoneList.toArray(), Iterables.toArray(page.getValues(), Zone.class));
   }
 
@@ -1152,7 +1152,7 @@ public void testListEmptyZones() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page page = compute.listZones();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(zones.toArray(), Iterables.toArray(page.getValues(), Zone.class));
   }
 
@@ -1167,7 +1167,7 @@ public void testListZonesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page =
         compute.listZones(ZONE_LIST_PAGE_SIZE, ZONE_LIST_PAGE_TOKEN, ZONE_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(zoneList.toArray(), Iterables.toArray(page.getValues(), Zone.class));
   }
 
@@ -1295,7 +1295,7 @@ public void testListGlobalOperations() {
     EasyMock.expect(computeRpcMock.listGlobalOperations(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listGlobalOperations();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(operationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
   }
@@ -1317,11 +1317,11 @@ public void testListGlobalOperationsNextPage() {
     EasyMock.expect(computeRpcMock.listGlobalOperations(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listGlobalOperations();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(operationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextOperationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
   }
@@ -1336,7 +1336,7 @@ public void testListEmptyGlobalOperations() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page page = compute.listGlobalOperations();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(operations.toArray(), Iterables.toArray(page.getValues(), Operation.class));
   }
 
@@ -1351,7 +1351,7 @@ public void testListGlobalOperationsWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listGlobalOperations(OPERATION_LIST_PAGE_SIZE,
         OPERATION_LIST_PAGE_TOKEN, OPERATION_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(operationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
   }
@@ -1426,7 +1426,7 @@ public void testListRegionOperations() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listRegionOperations(REGION_OPERATION_ID.getRegion());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(operationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
   }
@@ -1450,11 +1450,11 @@ public void testListRegionOperationsNextPage() {
         nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listRegionOperations(REGION_OPERATION_ID.getRegion());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(operationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextOperationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
   }
@@ -1471,7 +1471,7 @@ public void testListEmptyRegionOperations() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page page = compute.listRegionOperations(REGION_OPERATION_ID.getRegion());
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(operations.toArray(), Iterables.toArray(page.getValues(), Operation.class));
   }
 
@@ -1488,7 +1488,7 @@ public void testListRegionOperationsWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listRegionOperations(REGION_OPERATION_ID.getRegion(),
         OPERATION_LIST_PAGE_SIZE, OPERATION_LIST_PAGE_TOKEN, OPERATION_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(operationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
   }
@@ -1560,7 +1560,7 @@ public void testListZoneOperations() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listZoneOperations(ZONE_OPERATION_ID.getZone());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(operationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
   }
@@ -1585,11 +1585,11 @@ public void testListZoneOperationsNextPage() {
         .andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listZoneOperations(ZONE_OPERATION_ID.getZone());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(operationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextOperationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
   }
@@ -1606,7 +1606,7 @@ public void testListEmptyZoneOperations() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page page = compute.listZoneOperations(ZONE_OPERATION_ID.getZone());
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(operations.toArray(), Iterables.toArray(page.getValues(), Operation.class));
   }
 
@@ -1623,7 +1623,7 @@ public void testListZoneOperationsWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listZoneOperations(ZONE_OPERATION_ID.getZone(),
         OPERATION_LIST_PAGE_SIZE, OPERATION_LIST_PAGE_TOKEN, OPERATION_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(operationList.toArray(),
         Iterables.toArray(page.getValues(), Operation.class));
   }
@@ -1806,7 +1806,7 @@ public void testListGlobalAddresses() {
     EasyMock.expect(computeRpcMock.listGlobalAddresses(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page
 page = compute.listGlobalAddresses();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(addressList.toArray(), Iterables.toArray(page.getValues(), Address.class));
   }
 
@@ -1830,10 +1830,10 @@ public void testListGlobalAddressesNextPage() {
     EasyMock.expect(computeRpcMock.listGlobalAddresses(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page
 page = compute.listGlobalAddresses();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(addressList.toArray(), Iterables.toArray(page.getValues(), Address.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextAddressList.toArray(),
         Iterables.toArray(page.getValues(), Address.class));
   }
@@ -1848,7 +1848,7 @@ public void testListEmptyGlobalAddresses() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page
 page = compute.listGlobalAddresses();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(addresses.toArray(), Iterables.toArray(page.getValues(), Address.class));
   }
 
@@ -1865,7 +1865,7 @@ public void testListGlobalAddressesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page
 page = compute.listGlobalAddresses(ADDRESS_LIST_PAGE_SIZE,
         ADDRESS_LIST_PAGE_TOKEN, ADDRESS_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(addressList.toArray(), Iterables.toArray(page.getValues(), Address.class));
   }
 
@@ -1883,7 +1883,7 @@ public void testListRegionAddresses() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page
 page = compute.listRegionAddresses(REGION_ADDRESS_ID.getRegion());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(addressList.toArray(), Iterables.toArray(page.getValues(), Address.class));
   }
 
@@ -1911,10 +1911,10 @@ public void testListRegionAddressesNextPage() {
         .andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page
 page = compute.listRegionAddresses(REGION_ADDRESS_ID.getRegion());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(addressList.toArray(), Iterables.toArray(page.getValues(), Address.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextAddressList.toArray(),
         Iterables.toArray(page.getValues(), Address.class));
   }
@@ -1931,7 +1931,7 @@ public void testListEmptyRegionAddresses() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page
 page = compute.listRegionAddresses(REGION_ADDRESS_ID.getRegion());
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(addresses.toArray(), Iterables.toArray(page.getValues(), Address.class));
   }
 
@@ -1950,7 +1950,7 @@ public void testListRegionAddressesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page
 page = compute.listRegionAddresses(REGION_ADDRESS_ID.getRegion(),
         ADDRESS_LIST_PAGE_SIZE, ADDRESS_LIST_PAGE_TOKEN, ADDRESS_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(addressList.toArray(), Iterables.toArray(page.getValues(), Address.class));
   }
 
@@ -1966,7 +1966,7 @@ public void testAggregatedListAddresses() {
     EasyMock.expect(computeRpcMock.listAddresses(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page
 page = compute.listAddresses();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(addressList.toArray(), Iterables.toArray(page.getValues(), Address.class));
   }
 
@@ -1990,10 +1990,10 @@ public void testAggregatedListAddressesNextPage() {
     EasyMock.expect(computeRpcMock.listAddresses(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page
 page = compute.listAddresses();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(addressList.toArray(), Iterables.toArray(page.getValues(), Address.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextAddressList.toArray(),
         Iterables.toArray(page.getValues(), Address.class));
   }
@@ -2008,7 +2008,7 @@ public void testAggregatedListEmptyAddresses() {
     EasyMock.replay(computeRpcMock);
     compute = options.getService();
     Page
 page = compute.listAddresses();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(addresses.toArray(), Iterables.toArray(page.getValues(), Address.class));
   }
 
@@ -2025,7 +2025,7 @@ public void testAggregatedListAddressesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page
 page = compute.listAddresses(ADDRESS_AGGREGATED_LIST_PAGE_SIZE,
         ADDRESS_AGGREGATED_LIST_PAGE_TOKEN, ADDRESS_AGGREGATED_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(addressList.toArray(), Iterables.toArray(page.getValues(), Address.class));
   }
 
@@ -2199,7 +2199,7 @@ public void testListSnapshots() {
     EasyMock.expect(computeRpcMock.listSnapshots(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSnapshots();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(snapshotList.toArray(), Iterables.toArray(page.getValues(), Snapshot.class));
   }
 
@@ -2223,10 +2223,10 @@ public void testListSnapshotsNextPage() {
     EasyMock.expect(computeRpcMock.listSnapshots(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSnapshots();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(snapshotList.toArray(), Iterables.toArray(page.getValues(), Snapshot.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextSnapshotList.toArray(),
         Iterables.toArray(page.getValues(), Snapshot.class));
   }
@@ -2241,7 +2241,7 @@ public void testListEmptySnapshots() {
     EasyMock.expect(computeRpcMock.listSnapshots(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSnapshots();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(snapshots.toArray(), Iterables.toArray(page.getValues(), Snapshot.class));
   }
 
@@ -2258,7 +2258,7 @@ public void testListSnapshotsWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSnapshots(SNAPSHOT_LIST_PAGE_SIZE, SNAPSHOT_LIST_PAGE_TOKEN,
         SNAPSHOT_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(snapshotList.toArray(), Iterables.toArray(page.getValues(), Snapshot.class));
   }
 
@@ -2411,7 +2411,7 @@ public void testListImages() {
     EasyMock.expect(computeRpcMock.listImages(PROJECT, EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listImages();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(imageList.toArray(), Iterables.toArray(page.getValues(), Image.class));
   }
 
@@ -2435,10 +2435,10 @@ public void testListImagesNextPage() {
     EasyMock.expect(computeRpcMock.listImages(PROJECT, nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listImages();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(imageList.toArray(), Iterables.toArray(page.getValues(), Image.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextImageList.toArray(), Iterables.toArray(page.getValues(), Image.class));
   }
 
@@ -2454,7 +2454,7 @@ public void testListImagesForProject() {
     EasyMock.expect(computeRpcMock.listImages("otherProject", EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listImages("otherProject");
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(imageList.toArray(), Iterables.toArray(page.getValues(), Image.class));
   }
 
@@ -2468,7 +2468,7 @@ public void testListEmptyImages() {
     EasyMock.expect(computeRpcMock.listImages(PROJECT, EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listImages();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(images.toArray(), Iterables.toArray(page.getValues(), Image.class));
   }
 
@@ -2482,7 +2482,7 @@ public void testListEmptyImagesForProject() {
     EasyMock.expect(computeRpcMock.listImages("otherProject", EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listImages("otherProject");
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(images.toArray(), Iterables.toArray(page.getValues(), Image.class));
   }
 
@@ -2499,7 +2499,7 @@ public void testListImagesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listImages(IMAGE_LIST_PAGE_SIZE, IMAGE_LIST_PAGE_TOKEN,
         IMAGE_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(imageList.toArray(), Iterables.toArray(page.getValues(), Image.class));
   }
 
@@ -2516,7 +2516,7 @@ public void testListImagesForProjectWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listImages("other", IMAGE_LIST_PAGE_SIZE, IMAGE_LIST_PAGE_TOKEN,
         IMAGE_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(imageList.toArray(), Iterables.toArray(page.getValues(), Image.class));
   }
 
@@ -2608,7 +2608,7 @@ public void testListDisks() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDisks(DISK_ID.getZone());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskList.toArray(), Iterables.toArray(page.getValues(), Disk.class));
   }
 
@@ -2632,10 +2632,10 @@ public void testListDisksNextPage() {
     EasyMock.expect(computeRpcMock.listDisks(DISK_ID.getZone(), nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDisks(DISK_ID.getZone());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskList.toArray(), Iterables.toArray(page.getValues(), Disk.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextDiskList.toArray(), Iterables.toArray(page.getValues(), Disk.class));
   }
 
@@ -2650,7 +2650,7 @@ public void testListEmptyDisks() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDisks(DISK_ID.getZone());
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(disks.toArray(), Iterables.toArray(page.getValues(), Disk.class));
   }
 
@@ -2668,7 +2668,7 @@ public void testListDisksWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDisks(
         DISK_ID.getZone(), DISK_LIST_PAGE_SIZE, DISK_LIST_PAGE_TOKEN, DISK_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskList.toArray(), Iterables.toArray(page.getValues(), Disk.class));
   }
 
@@ -2684,7 +2684,7 @@ public void testAggregatedListDisks() {
     EasyMock.expect(computeRpcMock.listDisks(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDisks();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskList.toArray(), Iterables.toArray(page.getValues(), Disk.class));
   }
 
@@ -2707,10 +2707,10 @@ public void testAggregatedListDisksNextPage() {
     EasyMock.expect(computeRpcMock.listDisks(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDisks();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskList.toArray(), Iterables.toArray(page.getValues(), Disk.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextDiskList.toArray(), Iterables.toArray(page.getValues(), Disk.class));
   }
 
@@ -2724,7 +2724,7 @@ public void testAggregatedListEmptyDisks() {
     EasyMock.expect(computeRpcMock.listDisks(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDisks();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(diskList.toArray(), Iterables.toArray(page.getValues(), Disk.class));
   }
 
@@ -2741,7 +2741,7 @@ public void testAggregatedListDisksWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listDisks(DISK_AGGREGATED_LIST_PAGE_SIZE,
         DISK_AGGREGATED_LIST_PAGE_TOKEN, DISK_AGGREGATED_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(diskList.toArray(), Iterables.toArray(page.getValues(), Disk.class));
   }
 
@@ -2901,7 +2901,7 @@ public void testListSubnetworks() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSubnetworks(SUBNETWORK_ID.getRegion());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(subnetworkList.toArray(),
         Iterables.toArray(page.getValues(), Subnetwork.class));
   }
@@ -2929,11 +2929,11 @@ public void testListSubnetworksNextPage() {
         .andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSubnetworks(SUBNETWORK_ID.getRegion());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(subnetworkList.toArray(),
         Iterables.toArray(page.getValues(), Subnetwork.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextSubnetworkList.toArray(),
         Iterables.toArray(page.getValues(), Subnetwork.class));
   }
@@ -2951,7 +2951,7 @@ public void testListEmptySubnetworks() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSubnetworks(SUBNETWORK_ID.getRegion());
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(subnetworks.toArray(), Iterables.toArray(page.getValues(), Subnetwork.class));
   }
 
@@ -2971,7 +2971,7 @@ public void testListSubnetworksWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSubnetworks(SUBNETWORK_ID.getRegion(),
         SUBNETWORK_LIST_PAGE_SIZE, SUBNETWORK_LIST_PAGE_TOKEN, SUBNETWORK_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(subnetworkList.toArray(),
         Iterables.toArray(page.getValues(), Subnetwork.class));
   }
@@ -2989,7 +2989,7 @@ public void testAggregatedListSubnetworks() {
     EasyMock.expect(computeRpcMock.listSubnetworks(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSubnetworks();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(subnetworkList.toArray(),
         Iterables.toArray(page.getValues(), Subnetwork.class));
   }
@@ -3015,11 +3015,11 @@ public void testAggregatedListSubnetworksNextPage() {
     EasyMock.expect(computeRpcMock.listSubnetworks(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSubnetworks();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(subnetworkList.toArray(),
         Iterables.toArray(page.getValues(), Subnetwork.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextSubnetworkList.toArray(),
         Iterables.toArray(page.getValues(), Subnetwork.class));
   }
@@ -3036,7 +3036,7 @@ public void testAggregatedListEmptySubnetworks() {
     EasyMock.expect(computeRpcMock.listSubnetworks(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSubnetworks();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(subnetworks.toArray(), Iterables.toArray(page.getValues(), Subnetwork.class));
   }
 
@@ -3054,7 +3054,7 @@ public void testAggregatedListSubnetworksWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listSubnetworks(SUBNETWORK_AGGREGATED_LIST_PAGE_SIZE,
         SUBNETWORK_AGGREGATED_LIST_PAGE_TOKEN, SUBNETWORK_AGGREGATED_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(subnetworkList.toArray(),
         Iterables.toArray(page.getValues(), Subnetwork.class));
   }
@@ -3174,7 +3174,7 @@ public void testListNetworks() {
     EasyMock.expect(computeRpcMock.listNetworks(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listNetworks();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(networkList.toArray(), Iterables.toArray(page.getValues(), Network.class));
   }
 
@@ -3198,10 +3198,10 @@ public void testListNetworksNextPage() {
     EasyMock.expect(computeRpcMock.listNetworks(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listNetworks();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(networkList.toArray(), Iterables.toArray(page.getValues(), Network.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextNetworkList.toArray(),
         Iterables.toArray(page.getValues(), Network.class));
   }
@@ -3216,7 +3216,7 @@ public void testListEmptyNetworks() {
     EasyMock.expect(computeRpcMock.listNetworks(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listNetworks();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(networks.toArray(), Iterables.toArray(page.getValues(), Network.class));
   }
 
@@ -3233,7 +3233,7 @@ public void testListNetworksWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listNetworks(NETWORK_LIST_PAGE_SIZE, NETWORK_LIST_PAGE_TOKEN,
         NETWORK_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(networkList.toArray(), Iterables.toArray(page.getValues(), Network.class));
   }
 
@@ -3351,7 +3351,7 @@ public void testListInstances() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listInstances(INSTANCE_ID.getZone());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(instanceList.toArray(), Iterables.toArray(page.getValues(), Instance.class));
   }
 
@@ -3377,10 +3377,10 @@ public void testListInstancesNextPage() {
         .andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listInstances(INSTANCE_ID.getZone());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(instanceList.toArray(), Iterables.toArray(page.getValues(), Instance.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextInstanceList.toArray(),
         Iterables.toArray(page.getValues(), Instance.class));
   }
@@ -3396,7 +3396,7 @@ public void testListEmptyInstances() {
         .andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listInstances(INSTANCE_ID.getZone());
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(instances.toArray(), Iterables.toArray(page.getValues(), Instance.class));
   }
 
@@ -3414,7 +3414,7 @@ public void testListInstancesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listInstances(INSTANCE_ID.getZone(), INSTANCE_LIST_PAGE_SIZE,
         INSTANCE_LIST_PAGE_TOKEN, INSTANCE_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(instanceList.toArray(), Iterables.toArray(page.getValues(), Instance.class));
   }
 
@@ -3430,7 +3430,7 @@ public void testAggregatedListInstances() {
     EasyMock.expect(computeRpcMock.listInstances(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listInstances();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(instanceList.toArray(), Iterables.toArray(page.getValues(), Instance.class));
   }
 
@@ -3454,10 +3454,10 @@ public void testAggregatedListInstancesNextPage() {
     EasyMock.expect(computeRpcMock.listInstances(nextOptions)).andReturn(nextResult);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listInstances();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(instanceList.toArray(), Iterables.toArray(page.getValues(), Instance.class));
     page = page.getNextPage();
-    assertEquals(nextCursor, page.getNextPageCursor());
+    assertEquals(nextCursor, page.getNextPageToken());
     assertArrayEquals(nextInstanceList.toArray(),
         Iterables.toArray(page.getValues(), Instance.class));
   }
@@ -3472,7 +3472,7 @@ public void testAggregatedListEmptyInstances() {
     EasyMock.expect(computeRpcMock.listInstances(EMPTY_RPC_OPTIONS)).andReturn(result);
     EasyMock.replay(computeRpcMock);
     Page page = compute.listInstances();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(instanceList.toArray(), Iterables.toArray(page.getValues(), Instance.class));
   }
 
@@ -3489,7 +3489,7 @@ public void testAggregatedListInstancesWithOptions() {
     EasyMock.replay(computeRpcMock);
     Page page = compute.listInstances(INSTANCE_AGGREGATED_LIST_PAGE_SIZE,
         INSTANCE_AGGREGATED_LIST_PAGE_TOKEN, INSTANCE_AGGREGATED_LIST_FILTER);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(instanceList.toArray(), Iterables.toArray(page.getValues(), Instance.class));
   }
 
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/it/ITComputeTest.java b/google-cloud-compute/src/test/java/com/google/cloud/compute/it/ITComputeTest.java
index 1d7eb4b293ed..b36830c6c5bc 100644
--- a/google-cloud-compute/src/test/java/com/google/cloud/compute/it/ITComputeTest.java
+++ b/google-cloud-compute/src/test/java/com/google/cloud/compute/it/ITComputeTest.java
@@ -23,7 +23,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.compute.Address;
 import com.google.cloud.compute.AddressId;
 import com.google.cloud.compute.AddressInfo;
@@ -139,7 +139,7 @@ public void testGetDiskTypeWithSelectedFields() {
   @Test
   public void testListDiskTypes() {
     Page diskPage = compute.listDiskTypes(ZONE);
-    Iterator diskTypeIterator = diskPage.iterateAll();
+    Iterator diskTypeIterator = diskPage.iterateAll().iterator();
     assertTrue(diskTypeIterator.hasNext());
     while (diskTypeIterator.hasNext()) {
       DiskType diskType = diskTypeIterator.next();
@@ -157,7 +157,7 @@ public void testListDiskTypes() {
   public void testListDiskTypesWithSelectedFields() {
     Page diskPage = compute.listDiskTypes(ZONE,
         Compute.DiskTypeListOption.fields(Compute.DiskTypeField.CREATION_TIMESTAMP));
-    Iterator diskTypeIterator = diskPage.iterateAll();
+    Iterator diskTypeIterator = diskPage.iterateAll().iterator();
     assertTrue(diskTypeIterator.hasNext());
     while (diskTypeIterator.hasNext()) {
       DiskType diskType = diskTypeIterator.next();
@@ -175,7 +175,7 @@ public void testListDiskTypesWithSelectedFields() {
   public void testListDiskTypesWithFilter() {
     Page diskPage = compute.listDiskTypes(ZONE, Compute.DiskTypeListOption.filter(
         Compute.DiskTypeFilter.equals(Compute.DiskTypeField.DEFAULT_DISK_SIZE_GB, 375)));
-    Iterator diskTypeIterator = diskPage.iterateAll();
+    Iterator diskTypeIterator = diskPage.iterateAll().iterator();
     assertTrue(diskTypeIterator.hasNext());
     while (diskTypeIterator.hasNext()) {
       DiskType diskType = diskTypeIterator.next();
@@ -193,7 +193,7 @@ public void testListDiskTypesWithFilter() {
   @Test
   public void testAggregatedListDiskTypes() {
     Page diskPage = compute.listDiskTypes();
-    Iterator diskTypeIterator = diskPage.iterateAll();
+    Iterator diskTypeIterator = diskPage.iterateAll().iterator();
     assertTrue(diskTypeIterator.hasNext());
     while (diskTypeIterator.hasNext()) {
       DiskType diskType = diskTypeIterator.next();
@@ -210,7 +210,7 @@ public void testAggregatedListDiskTypes() {
   public void testAggregatedListDiskTypesWithFilter() {
     Page diskPage = compute.listDiskTypes(Compute.DiskTypeAggregatedListOption.filter(
         Compute.DiskTypeFilter.notEquals(Compute.DiskTypeField.DEFAULT_DISK_SIZE_GB, 375)));
-    Iterator diskTypeIterator = diskPage.iterateAll();
+    Iterator diskTypeIterator = diskPage.iterateAll().iterator();
     assertTrue(diskTypeIterator.hasNext());
     while (diskTypeIterator.hasNext()) {
       DiskType diskType = diskTypeIterator.next();
@@ -256,7 +256,7 @@ public void testGetMachineTypeWithSelectedFields() {
   @Test
   public void testListMachineTypes() {
     Page machinePage = compute.listMachineTypes(ZONE);
-    Iterator machineTypeIterator = machinePage.iterateAll();
+    Iterator machineTypeIterator = machinePage.iterateAll().iterator();
     assertTrue(machineTypeIterator.hasNext());
     while (machineTypeIterator.hasNext()) {
       MachineType machineType = machineTypeIterator.next();
@@ -276,7 +276,7 @@ public void testListMachineTypes() {
   public void testListMachineTypesWithSelectedFields() {
     Page machinePage = compute.listMachineTypes(ZONE,
         Compute.MachineTypeListOption.fields(Compute.MachineTypeField.CREATION_TIMESTAMP));
-    Iterator machineTypeIterator = machinePage.iterateAll();
+    Iterator machineTypeIterator = machinePage.iterateAll().iterator();
     assertTrue(machineTypeIterator.hasNext());
     while (machineTypeIterator.hasNext()) {
       MachineType machineType = machineTypeIterator.next();
@@ -297,7 +297,7 @@ public void testListMachineTypesWithFilter() {
     Page machinePage = compute.listMachineTypes(ZONE,
         Compute.MachineTypeListOption.filter(
             Compute.MachineTypeFilter.equals(Compute.MachineTypeField.GUEST_CPUS, 2)));
-    Iterator machineTypeIterator = machinePage.iterateAll();
+    Iterator machineTypeIterator = machinePage.iterateAll().iterator();
     assertTrue(machineTypeIterator.hasNext());
     while (machineTypeIterator.hasNext()) {
       MachineType machineType = machineTypeIterator.next();
@@ -317,7 +317,7 @@ public void testListMachineTypesWithFilter() {
   @Test
   public void testAggregatedListMachineTypes() {
     Page machinePage = compute.listMachineTypes();
-    Iterator machineTypeIterator = machinePage.iterateAll();
+    Iterator machineTypeIterator = machinePage.iterateAll().iterator();
     assertTrue(machineTypeIterator.hasNext());
     while (machineTypeIterator.hasNext()) {
       MachineType machineType = machineTypeIterator.next();
@@ -337,7 +337,7 @@ public void testAggregatedListMachineTypesWithFilter() {
     Page machinePage =
         compute.listMachineTypes(Compute.MachineTypeAggregatedListOption.filter(
             Compute.MachineTypeFilter.notEquals(Compute.MachineTypeField.GUEST_CPUS, 2)));
-    Iterator machineTypeIterator = machinePage.iterateAll();
+    Iterator machineTypeIterator = machinePage.iterateAll().iterator();
     assertTrue(machineTypeIterator.hasNext());
     while (machineTypeIterator.hasNext()) {
       MachineType machineType = machineTypeIterator.next();
@@ -394,7 +394,7 @@ public void testGetRegionWithSelectedFields() {
   @Test
   public void testListRegions() {
     Page regionPage = compute.listRegions();
-    Iterator regionIterator = regionPage.iterateAll();
+    Iterator regionIterator = regionPage.iterateAll().iterator();
     while (regionIterator.hasNext()) {
       Region region = regionIterator.next();
       assertNotNull(region.getRegionId());
@@ -411,7 +411,7 @@ public void testListRegions() {
   public void testListRegionsWithSelectedFields() {
     Page regionPage =
         compute.listRegions(Compute.RegionListOption.fields(Compute.RegionField.ID));
-    Iterator regionIterator = regionPage.iterateAll();
+    Iterator regionIterator = regionPage.iterateAll().iterator();
     while (regionIterator.hasNext()) {
       Region region = regionIterator.next();
       assertNotNull(region.getRegionId());
@@ -428,7 +428,7 @@ public void testListRegionsWithSelectedFields() {
   public void testListRegionsWithFilter() {
     Page regionPage = compute.listRegions(Compute.RegionListOption.filter(
         Compute.RegionFilter.equals(Compute.RegionField.NAME, REGION)));
-    Iterator regionIterator = regionPage.iterateAll();
+    Iterator regionIterator = regionPage.iterateAll().iterator();
     assertEquals(REGION, regionIterator.next().getRegionId().getRegion());
     assertFalse(regionIterator.hasNext());
   }
@@ -458,7 +458,7 @@ public void testGetZoneWithSelectedFields() {
   @Test
   public void testListZones() {
     Page zonePage = compute.listZones();
-    Iterator zoneIterator = zonePage.iterateAll();
+    Iterator zoneIterator = zonePage.iterateAll().iterator();
     while (zoneIterator.hasNext()) {
       Zone zone = zoneIterator.next();
       assertNotNull(zone.getZoneId());
@@ -474,7 +474,7 @@ public void testListZones() {
   public void testListZonesWithSelectedFields() {
     Page zonePage = compute.listZones(
         Compute.ZoneListOption.fields(Compute.ZoneField.CREATION_TIMESTAMP));
-    Iterator zoneIterator = zonePage.iterateAll();
+    Iterator zoneIterator = zonePage.iterateAll().iterator();
     while (zoneIterator.hasNext()) {
       Zone zone = zoneIterator.next();
       assertNotNull(zone.getZoneId());
@@ -490,7 +490,7 @@ public void testListZonesWithSelectedFields() {
   public void testListZonesWithFilter() {
     Page zonePage = compute.listZones(
         Compute.ZoneListOption.filter(Compute.ZoneFilter.equals(Compute.ZoneField.NAME, ZONE)));
-    Iterator zoneIterator = zonePage.iterateAll();
+    Iterator zoneIterator = zonePage.iterateAll().iterator();
     assertEquals(ZONE, zoneIterator.next().getZoneId().getZone());
     assertFalse(zoneIterator.hasNext());
   }
@@ -498,7 +498,7 @@ public void testListZonesWithFilter() {
   @Test
   public void testListGlobalOperations() {
     Page operationPage = compute.listGlobalOperations();
-    Iterator operationIterator = operationPage.iterateAll();
+    Iterator operationIterator = operationPage.iterateAll().iterator();
     while (operationIterator.hasNext()) {
       Operation operation = operationIterator.next();
       assertNotNull(operation.getGeneratedId());
@@ -515,7 +515,7 @@ public void testListGlobalOperations() {
   public void testListGlobalOperationsWithSelectedFields() {
     Page operationPage =
         compute.listGlobalOperations(Compute.OperationListOption.fields(Compute.OperationField.ID));
-    Iterator operationIterator = operationPage.iterateAll();
+    Iterator operationIterator = operationPage.iterateAll().iterator();
     while (operationIterator.hasNext()) {
       Operation operation = operationIterator.next();
       assertNotNull(operation.getGeneratedId());
@@ -541,7 +541,7 @@ public void testListGlobalOperationsWithSelectedFields() {
   public void testListGlobalOperationsWithFilter() {
     Page operationPage = compute.listGlobalOperations(Compute.OperationListOption.filter(
         Compute.OperationFilter.equals(Compute.OperationField.STATUS, "DONE")));
-    Iterator operationIterator = operationPage.iterateAll();
+    Iterator operationIterator = operationPage.iterateAll().iterator();
     while (operationIterator.hasNext()) {
       Operation operation = operationIterator.next();
       assertNotNull(operation.getGeneratedId());
@@ -557,7 +557,7 @@ public void testListGlobalOperationsWithFilter() {
   @Test
   public void testListRegionOperations() {
     Page operationPage = compute.listRegionOperations(REGION);
-    Iterator operationIterator = operationPage.iterateAll();
+    Iterator operationIterator = operationPage.iterateAll().iterator();
     while (operationIterator.hasNext()) {
       Operation operation = operationIterator.next();
       assertNotNull(operation.getGeneratedId());
@@ -575,7 +575,7 @@ public void testListRegionOperations() {
   public void testListRegionOperationsWithSelectedFields() {
     Page operationPage = compute.listRegionOperations(REGION,
         Compute.OperationListOption.fields(Compute.OperationField.ID));
-    Iterator operationIterator = operationPage.iterateAll();
+    Iterator operationIterator = operationPage.iterateAll().iterator();
     while (operationIterator.hasNext()) {
       Operation operation = operationIterator.next();
       assertNotNull(operation.getGeneratedId());
@@ -603,7 +603,7 @@ public void testListRegionOperationsWithFilter() {
     Page operationPage = compute.listRegionOperations(REGION,
         Compute.OperationListOption.filter(Compute.OperationFilter.equals(
             Compute.OperationField.STATUS, "DONE")));
-    Iterator operationIterator = operationPage.iterateAll();
+    Iterator operationIterator = operationPage.iterateAll().iterator();
     while (operationIterator.hasNext()) {
       Operation operation = operationIterator.next();
       assertNotNull(operation.getGeneratedId());
@@ -620,7 +620,7 @@ public void testListRegionOperationsWithFilter() {
   @Test
   public void testListZoneOperations() {
     Page operationPage = compute.listZoneOperations(ZONE);
-    Iterator operationIterator = operationPage.iterateAll();
+    Iterator operationIterator = operationPage.iterateAll().iterator();
     while (operationIterator.hasNext()) {
       Operation operation = operationIterator.next();
       assertNotNull(operation.getGeneratedId());
@@ -638,7 +638,7 @@ public void testListZoneOperations() {
   public void testListZoneOperationsWithSelectedFields() {
     Page operationPage = compute.listZoneOperations(ZONE,
         Compute.OperationListOption.fields(Compute.OperationField.ID));
-    Iterator operationIterator = operationPage.iterateAll();
+    Iterator operationIterator = operationPage.iterateAll().iterator();
     while (operationIterator.hasNext()) {
       Operation operation = operationIterator.next();
       assertNotNull(operation.getGeneratedId());
@@ -666,7 +666,7 @@ public void testListZoneOperationsWithFilter() {
     Page operationPage = compute.listZoneOperations(ZONE,
         Compute.OperationListOption.filter(Compute.OperationFilter.equals(
             Compute.OperationField.STATUS, "DONE")));
-    Iterator operationIterator = operationPage.iterateAll();
+    Iterator operationIterator = operationPage.iterateAll().iterator();
     while (operationIterator.hasNext()) {
       Operation operation = operationIterator.next();
       assertNotNull(operation.getGeneratedId());
@@ -727,7 +727,7 @@ public void testListRegionAddresses() throws InterruptedException, TimeoutExcept
         Compute.AddressFilter.equals(Compute.AddressField.NAME, prefix + "\\d");
     Page
 addressPage =
         compute.listRegionAddresses(REGION, Compute.AddressListOption.filter(filter));
-    Iterator
 addressIterator = addressPage.iterateAll();
+    Iterator
 addressIterator = addressPage.iterateAll().iterator();
     int count = 0;
     while (addressIterator.hasNext()) {
       Address address = addressIterator.next();
@@ -745,7 +745,7 @@ public void testListRegionAddresses() throws InterruptedException, TimeoutExcept
     count = 0;
     addressPage = compute.listRegionAddresses(REGION, Compute.AddressListOption.filter(filter),
         Compute.AddressListOption.fields(Compute.AddressField.ADDRESS));
-    addressIterator = addressPage.iterateAll();
+    addressIterator = addressPage.iterateAll().iterator();
     while (addressIterator.hasNext()) {
       Address address = addressIterator.next();
       assertTrue(address.getAddressId() instanceof RegionAddressId);
@@ -778,7 +778,7 @@ public void testAggregatedListAddresses() throws InterruptedException, TimeoutEx
         Compute.AddressFilter.equals(Compute.AddressField.NAME, prefix + "\\d");
     Page
 addressPage =
         compute.listAddresses(Compute.AddressAggregatedListOption.filter(filter));
-    Iterator
 addressIterator = addressPage.iterateAll();
+    Iterator
 addressIterator = addressPage.iterateAll().iterator();
     int count = 0;
     while (addressIterator.hasNext()) {
       Address address = addressIterator.next();
@@ -839,7 +839,7 @@ public void testListGlobalAddresses() throws InterruptedException, TimeoutExcept
         Compute.AddressFilter.equals(Compute.AddressField.NAME, prefix + "\\d");
     Page
 addressPage =
         compute.listGlobalAddresses(Compute.AddressListOption.filter(filter));
-    Iterator
 addressIterator = addressPage.iterateAll();
+    Iterator
 addressIterator = addressPage.iterateAll().iterator();
     int count = 0;
     while (addressIterator.hasNext()) {
       Address address = addressIterator.next();
@@ -856,7 +856,7 @@ public void testListGlobalAddresses() throws InterruptedException, TimeoutExcept
     count = 0;
     addressPage = compute.listGlobalAddresses(Compute.AddressListOption.filter(filter),
         Compute.AddressListOption.fields(Compute.AddressField.ADDRESS));
-    addressIterator = addressPage.iterateAll();
+    addressIterator = addressPage.iterateAll().iterator();
     while (addressIterator.hasNext()) {
       Address address = addressIterator.next();
       assertTrue(address.getAddressId() instanceof GlobalAddressId);
@@ -1066,7 +1066,7 @@ public void testListDisksAndSnapshots() throws InterruptedException, TimeoutExce
     Compute.DiskFilter diskFilter =
         Compute.DiskFilter.equals(Compute.DiskField.NAME, prefix + "\\d");
     Page diskPage = compute.listDisks(ZONE, Compute.DiskListOption.filter(diskFilter));
-    Iterator diskIterator = diskPage.iterateAll();
+    Iterator diskIterator = diskPage.iterateAll().iterator();
     int count = 0;
     while (diskIterator.hasNext()) {
       Disk remoteDisk = diskIterator.next();
@@ -1089,7 +1089,7 @@ public void testListDisksAndSnapshots() throws InterruptedException, TimeoutExce
     count = 0;
     diskPage = compute.listDisks(ZONE, Compute.DiskListOption.filter(diskFilter),
         Compute.DiskListOption.fields(Compute.DiskField.STATUS));
-    diskIterator = diskPage.iterateAll();
+    diskIterator = diskPage.iterateAll().iterator();
     while (diskIterator.hasNext()) {
       Disk remoteDisk = diskIterator.next();
       assertEquals(ZONE, remoteDisk.getDiskId().getZone());
@@ -1119,7 +1119,7 @@ public void testListDisksAndSnapshots() throws InterruptedException, TimeoutExce
         Compute.SnapshotFilter.equals(Compute.SnapshotField.NAME, prefix + "\\d");
     Page snapshotPage =
         compute.listSnapshots(Compute.SnapshotListOption.filter(snapshotFilter));
-    Iterator snapshotIterator = snapshotPage.iterateAll();
+    Iterator snapshotIterator = snapshotPage.iterateAll().iterator();
     count = 0;
     while (snapshotIterator.hasNext()) {
       Snapshot remoteSnapshot = snapshotIterator.next();
@@ -1138,7 +1138,7 @@ public void testListDisksAndSnapshots() throws InterruptedException, TimeoutExce
     // test list snapshots with selected fields
     snapshotPage = compute.listSnapshots(Compute.SnapshotListOption.filter(snapshotFilter),
         Compute.SnapshotListOption.fields(Compute.SnapshotField.CREATION_TIMESTAMP));
-    snapshotIterator = snapshotPage.iterateAll();
+    snapshotIterator = snapshotPage.iterateAll().iterator();
     count = 0;
     while (snapshotIterator.hasNext()) {
       Snapshot remoteSnapshot = snapshotIterator.next();
@@ -1178,7 +1178,7 @@ public void testAggregatedListDisks() throws InterruptedException, TimeoutExcept
     Compute.DiskFilter diskFilter =
         Compute.DiskFilter.equals(Compute.DiskField.NAME, prefix + "\\d");
     Page diskPage = compute.listDisks(Compute.DiskAggregatedListOption.filter(diskFilter));
-    Iterator diskIterator = diskPage.iterateAll();
+    Iterator diskIterator = diskPage.iterateAll().iterator();
     int count = 0;
     while (diskIterator.hasNext()) {
       Disk remoteDisk = diskIterator.next();
@@ -1260,7 +1260,7 @@ public void testCreateGetAndDeprecateImage() throws InterruptedException, Timeou
   @Test
   public void testListImages() {
     Page imagePage = compute.listImages(IMAGE_PROJECT);
-    Iterator imageIterator = imagePage.iterateAll();
+    Iterator imageIterator = imagePage.iterateAll().iterator();
     int count = 0;
     while (imageIterator.hasNext()) {
       count++;
@@ -1279,7 +1279,7 @@ public void testListImages() {
   public void testListImagesWithSelectedFields() {
     Page imagePage =
         compute.listImages(IMAGE_PROJECT, Compute.ImageListOption.fields(Compute.ImageField.ID));
-    Iterator imageIterator = imagePage.iterateAll();
+    Iterator imageIterator = imagePage.iterateAll().iterator();
     int count = 0;
     while (imageIterator.hasNext()) {
       count++;
@@ -1300,7 +1300,7 @@ public void testListImagesWithSelectedFields() {
   public void testListImagesWithFilter() {
     Page imagePage = compute.listImages(IMAGE_PROJECT, Compute.ImageListOption.filter(
         Compute.ImageFilter.equals(Compute.ImageField.ARCHIVE_SIZE_BYTES, 365056004L)));
-    Iterator imageIterator = imagePage.iterateAll();
+    Iterator imageIterator = imagePage.iterateAll().iterator();
     int count = 0;
     while (imageIterator.hasNext()) {
       count++;
@@ -1359,7 +1359,7 @@ public void testListNetworks() throws InterruptedException, TimeoutException {
     // test list
     Compute.NetworkFilter filter = Compute.NetworkFilter.equals(Compute.NetworkField.NAME, name);
     Page networkPage = compute.listNetworks(Compute.NetworkListOption.filter(filter));
-    Iterator networkIterator = networkPage.iterateAll();
+    Iterator networkIterator = networkPage.iterateAll().iterator();
     int count = 0;
     while (networkIterator.hasNext()) {
       Network network = networkIterator.next();
@@ -1376,7 +1376,7 @@ public void testListNetworks() throws InterruptedException, TimeoutException {
     count = 0;
     networkPage = compute.listNetworks(Compute.NetworkListOption.filter(filter),
         Compute.NetworkListOption.fields(Compute.NetworkField.CREATION_TIMESTAMP));
-    networkIterator = networkPage.iterateAll();
+    networkIterator = networkPage.iterateAll().iterator();
     while (networkIterator.hasNext()) {
       Network network = networkIterator.next();
       assertEquals(networkId.getNetwork(), network.getNetworkId().getNetwork());
@@ -1437,7 +1437,7 @@ public void testCreateNetworkAndSubnetwork() throws InterruptedException, Timeou
         Compute.SubnetworkFilter.equals(Compute.SubnetworkField.NAME, subnetworkName);
     Page subnetworkPage =
         compute.listSubnetworks(REGION, Compute.SubnetworkListOption.filter(filter));
-    Iterator subnetworkIterator = subnetworkPage.iterateAll();
+    Iterator subnetworkIterator = subnetworkPage.iterateAll().iterator();
     int count = 0;
     while (subnetworkIterator.hasNext()) {
       Subnetwork remoteSubnetwork = subnetworkIterator.next();
@@ -1454,7 +1454,7 @@ public void testCreateNetworkAndSubnetwork() throws InterruptedException, Timeou
     // test list subnetworks with selected fields
     subnetworkPage = compute.listSubnetworks(REGION, Compute.SubnetworkListOption.filter(filter),
         Compute.SubnetworkListOption.fields(Compute.SubnetworkField.CREATION_TIMESTAMP));
-    subnetworkIterator = subnetworkPage.iterateAll();
+    subnetworkIterator = subnetworkPage.iterateAll().iterator();
     count = 0;
     while (subnetworkIterator.hasNext()) {
       Subnetwork remoteSubnetwork = subnetworkIterator.next();
@@ -1505,7 +1505,7 @@ public void testAggregatedListSubnetworks() throws InterruptedException, Timeout
         Compute.SubnetworkFilter.equals(Compute.SubnetworkField.NAME, prefix + "\\d");
     Page subnetworkPage =
         compute.listSubnetworks(Compute.SubnetworkAggregatedListOption.filter(subnetworkFilter));
-    Iterator subnetworkIterator = subnetworkPage.iterateAll();
+    Iterator subnetworkIterator = subnetworkPage.iterateAll().iterator();
     int count = 0;
     while (subnetworkIterator.hasNext()) {
       Subnetwork remoteSubnetwork = subnetworkIterator.next();
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java b/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java
index 967a5aa7e43e..79d0362e5aac 100644
--- a/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java
+++ b/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java
@@ -32,7 +32,7 @@
 import com.google.api.services.dns.model.Project;
 import com.google.api.services.dns.model.ResourceRecordSet;
 import com.google.api.services.dns.model.ResourceRecordSetsListResponse;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.dns.spi.v1.DnsRpc;
 import com.google.cloud.dns.spi.v1.RpcBatch;
 import com.google.common.collect.ImmutableList;
@@ -183,7 +183,7 @@ public void testListZonesWithOptions() {
     EasyMock.replay(optionsMock);
     capturedCallback.onSuccess(response);
     Page page = batchResult.get();
-    assertEquals(PAGE_TOKEN, page.getNextPageCursor());
+    assertEquals(PAGE_TOKEN, page.getNextPageToken());
     Iterator iterator = page.getValues().iterator();
     int resultSize = 0;
     EasyMock.verify(dns);
@@ -463,7 +463,7 @@ public void testListRecordSetsWithOptions() {
         .setNextPageToken(PAGE_TOKEN);
     capturedCallback.onSuccess(response);
     Page page = batchResult.get();
-    assertEquals(PAGE_TOKEN, page.getNextPageCursor());
+    assertEquals(PAGE_TOKEN, page.getNextPageToken());
     Iterator iterator = page.getValues().iterator();
     int resultSize = 0;
     while (iterator.hasNext()) {
@@ -533,7 +533,7 @@ public void testListChangeRequestsWithOptions() {
     EasyMock.replay(optionsMock);
     capturedCallback.onSuccess(response);
     Page page = batchResult.get();
-    assertEquals(PAGE_TOKEN, page.getNextPageCursor());
+    assertEquals(PAGE_TOKEN, page.getNextPageToken());
     Iterator iterator = page.getValues().iterator();
     int resultSize = 0;
     EasyMock.verify(dns);
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java b/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java
index 0df4f8afff5b..046724b9b900 100644
--- a/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java
+++ b/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java
@@ -23,7 +23,7 @@
 import com.google.api.services.dns.model.Change;
 import com.google.api.services.dns.model.ManagedZone;
 import com.google.api.services.dns.model.ResourceRecordSet;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.dns.spi.v1.DnsRpc;
 import com.google.cloud.dns.spi.DnsRpcFactory;
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneTest.java b/google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneTest.java
index 0514b1fc7e6a..3477ba5223a6 100644
--- a/google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneTest.java
+++ b/google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneTest.java
@@ -30,7 +30,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.common.collect.ImmutableList;
 
 import org.junit.After;
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java b/google-cloud-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java
index 1da588be5398..64027431fcc3 100644
--- a/google-cloud-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java
+++ b/google-cloud-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java
@@ -23,7 +23,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.dns.ChangeRequest;
 import com.google.cloud.dns.ChangeRequestInfo;
 import com.google.cloud.dns.Dns;
@@ -105,11 +105,11 @@ private static void clear() {
         /* We wait for all changes to complete before retrieving a list of DNS records to be
         deleted. Waiting is necessary as changes potentially might create more records between
         when the list has been retrieved and executing the subsequent delete operation. */
-        Iterator iterator = zone.listChangeRequests().iterateAll();
+        Iterator iterator = zone.listChangeRequests().iterateAll().iterator();
         while (iterator.hasNext()) {
           waitForChangeToComplete(zoneName, iterator.next().getGeneratedId());
         }
-        Iterator recordSetIterator = zone.listRecordSets().iterateAll();
+        Iterator recordSetIterator = zone.listRecordSets().iterateAll().iterator();
         List toDelete = new LinkedList<>();
         while (recordSetIterator.hasNext()) {
           RecordSet recordSet = recordSetIterator.next();
@@ -383,15 +383,15 @@ public void testGetZone() {
   @Test
   public void testListZones() {
     try {
-      List zones = filter(DNS.listZones().iterateAll());
+      List zones = filter(DNS.listZones().iterateAll().iterator());
       assertEquals(0, zones.size());
       // some zones exists
       Zone created = DNS.create(ZONE1);
-      zones = filter(DNS.listZones().iterateAll());
+      zones = filter(DNS.listZones().iterateAll().iterator());
       assertEquals(created, zones.get(0));
       assertEquals(1, zones.size());
       created = DNS.create(ZONE_EMPTY_DESCRIPTION);
-      zones = filter(DNS.listZones().iterateAll());
+      zones = filter(DNS.listZones().iterateAll().iterator());
       assertEquals(2, zones.size());
       assertTrue(zones.contains(created));
       // error in options
@@ -412,7 +412,7 @@ public void testListZones() {
         assertFalse(ex.isRetryable());
       }
       // ok size
-      zones = filter(DNS.listZones(Dns.ZoneListOption.pageSize(1000)).iterateAll());
+      zones = filter(DNS.listZones(Dns.ZoneListOption.pageSize(1000)).iterateAll().iterator());
       assertEquals(2, zones.size()); // we still have only 2 zones
       // dns name problems
       try {
@@ -424,11 +424,11 @@ public void testListZones() {
         assertFalse(ex.isRetryable());
       }
       // ok name
-      zones = filter(DNS.listZones(Dns.ZoneListOption.dnsName(ZONE1.getDnsName())).iterateAll());
+      zones = filter(DNS.listZones(Dns.ZoneListOption.dnsName(ZONE1.getDnsName())).iterateAll().iterator());
       assertEquals(1, zones.size());
       // field options
       Iterator zoneIterator = DNS.listZones(Dns.ZoneListOption.dnsName(ZONE1.getDnsName()),
-          Dns.ZoneListOption.fields(ZoneField.ZONE_ID)).iterateAll();
+          Dns.ZoneListOption.fields(ZoneField.ZONE_ID)).iterateAll().iterator();
       Zone zone = zoneIterator.next();
       assertNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -439,7 +439,7 @@ public void testListZones() {
       assertNotNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
       zoneIterator = DNS.listZones(Dns.ZoneListOption.dnsName(ZONE1.getDnsName()),
-          Dns.ZoneListOption.fields(ZoneField.CREATION_TIME)).iterateAll();
+          Dns.ZoneListOption.fields(ZoneField.CREATION_TIME)).iterateAll().iterator();
       zone = zoneIterator.next();
       assertNotNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -450,7 +450,7 @@ public void testListZones() {
       assertNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
       zoneIterator = DNS.listZones(Dns.ZoneListOption.dnsName(ZONE1.getDnsName()),
-          Dns.ZoneListOption.fields(ZoneField.DNS_NAME)).iterateAll();
+          Dns.ZoneListOption.fields(ZoneField.DNS_NAME)).iterateAll().iterator();
       zone = zoneIterator.next();
       assertNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -461,7 +461,7 @@ public void testListZones() {
       assertNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
       zoneIterator = DNS.listZones(Dns.ZoneListOption.dnsName(ZONE1.getDnsName()),
-          Dns.ZoneListOption.fields(ZoneField.DESCRIPTION)).iterateAll();
+          Dns.ZoneListOption.fields(ZoneField.DESCRIPTION)).iterateAll().iterator();
       zone = zoneIterator.next();
       assertNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -472,7 +472,7 @@ public void testListZones() {
       assertNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
       zoneIterator = DNS.listZones(Dns.ZoneListOption.dnsName(ZONE1.getDnsName()),
-          Dns.ZoneListOption.fields(ZoneField.NAME_SERVERS)).iterateAll();
+          Dns.ZoneListOption.fields(ZoneField.NAME_SERVERS)).iterateAll().iterator();
       zone = zoneIterator.next();
       assertNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -483,7 +483,7 @@ public void testListZones() {
       assertNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
       zoneIterator = DNS.listZones(Dns.ZoneListOption.dnsName(ZONE1.getDnsName()),
-          Dns.ZoneListOption.fields(ZoneField.NAME_SERVER_SET)).iterateAll();
+          Dns.ZoneListOption.fields(ZoneField.NAME_SERVER_SET)).iterateAll().iterator();
       zone = zoneIterator.next();
       assertNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -496,7 +496,7 @@ public void testListZones() {
       // several combined
       zones = filter(DNS.listZones(Dns.ZoneListOption.fields(ZoneField.ZONE_ID,
           ZoneField.DESCRIPTION),
-          Dns.ZoneListOption.pageSize(1)).iterateAll());
+          Dns.ZoneListOption.pageSize(1)).iterateAll().iterator());
       assertEquals(2, zones.size());
       for (Zone current : zones) {
         assertNull(current.getCreationTimeMillis());
@@ -626,7 +626,7 @@ public void testInvalidChangeRequest() {
         assertFalse(ex.isRetryable());
       }
       // delete and add SOA
-      Iterator recordSetIterator = zone.listRecordSets().iterateAll();
+      Iterator recordSetIterator = zone.listRecordSets().iterateAll().iterator();
       LinkedList deletions = new LinkedList<>();
       LinkedList additions = new LinkedList<>();
       while (recordSetIterator.hasNext()) {
@@ -856,7 +856,7 @@ public void testListDnsRecords() {
       }
       // field options
       Iterator recordSetIterator = DNS.listRecordSets(zone.getName(),
-          Dns.RecordSetListOption.fields(RecordSetField.TTL)).iterateAll();
+          Dns.RecordSetListOption.fields(RecordSetField.TTL)).iterateAll().iterator();
       int counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -868,7 +868,7 @@ public void testListDnsRecords() {
       }
       assertEquals(2, counter);
       recordSetIterator = DNS.listRecordSets(zone.getName(),
-          Dns.RecordSetListOption.fields(RecordSetField.NAME)).iterateAll();
+          Dns.RecordSetListOption.fields(RecordSetField.NAME)).iterateAll().iterator();
       counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -881,7 +881,7 @@ public void testListDnsRecords() {
       assertEquals(2, counter);
       recordSetIterator = DNS.listRecordSets(zone.getName(),
           Dns.RecordSetListOption.fields(RecordSetField.DNS_RECORDS))
-          .iterateAll();
+          .iterateAll().iterator();
       counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -894,7 +894,7 @@ public void testListDnsRecords() {
       assertEquals(2, counter);
       recordSetIterator = DNS.listRecordSets(zone.getName(),
           Dns.RecordSetListOption.fields(RecordSetField.TYPE),
-          Dns.RecordSetListOption.pageSize(1)).iterateAll(); // also test paging
+          Dns.RecordSetListOption.pageSize(1)).iterateAll().iterator(); // also test paging
       counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -914,7 +914,7 @@ public void testListDnsRecords() {
       ChangeRequest change = DNS.applyChangeRequest(ZONE1.getName(), CHANGE_ADD_ZONE1);
       waitForChangeToComplete(ZONE1.getName(), change.getGeneratedId());
       recordSetIterator = DNS.listRecordSets(ZONE1.getName(),
-          Dns.RecordSetListOption.dnsName(A_RECORD_ZONE1.getName())).iterateAll();
+          Dns.RecordSetListOption.dnsName(A_RECORD_ZONE1.getName())).iterateAll().iterator();
       counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -927,7 +927,7 @@ public void testListDnsRecords() {
       waitForChangeToComplete(ZONE1.getName(), change.getGeneratedId());
       recordSetIterator = DNS.listRecordSets(ZONE1.getName(),
           Dns.RecordSetListOption.dnsName(A_RECORD_ZONE1.getName()),
-          Dns.RecordSetListOption.type(A_RECORD_ZONE1.getType())).iterateAll();
+          Dns.RecordSetListOption.type(A_RECORD_ZONE1.getType())).iterateAll().iterator();
       counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -975,14 +975,14 @@ public void testListZonesBatch() {
       DnsBatch batch = DNS.batch();
       DnsBatchResult> result = batch.listZones();
       batch.submit();
-      List zones = filter(result.get().iterateAll());
+      List zones = filter(result.get().iterateAll().iterator());
       assertEquals(0, zones.size());
       // some zones exists
       Zone firstZone = DNS.create(ZONE1);
       batch = DNS.batch();
       result = batch.listZones();
       batch.submit();
-      zones = filter(result.get().iterateAll());
+      zones = filter(result.get().iterateAll().iterator());
       assertEquals(1, zones.size());
       assertEquals(firstZone, zones.get(0));
       Zone created = DNS.create(ZONE_EMPTY_DESCRIPTION);
@@ -1018,7 +1018,7 @@ public void testListZonesBatch() {
           batch.listZones(Dns.ZoneListOption.fields(ZoneField.ZONE_ID, ZoneField.DESCRIPTION),
               Dns.ZoneListOption.pageSize(1));
       batch.submit();
-      zones = filter(result.get().iterateAll());
+      zones = filter(result.get().iterateAll().iterator());
       assertEquals(2, zones.size());
       assertTrue(zones.contains(firstZone));
       assertTrue(zones.contains(created));
@@ -1051,10 +1051,10 @@ public void testListZonesBatch() {
         assertFalse(ex.isRetryable());
       }
       // ok name
-      zones = filter(okName.get().iterateAll());
+      zones = filter(okName.get().iterateAll().iterator());
       assertEquals(1, zones.size());
       // field options
-      Iterator zoneIterator = idResult.get().iterateAll();
+      Iterator zoneIterator = idResult.get().iterateAll().iterator();
       Zone zone = zoneIterator.next();
       assertNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -1064,7 +1064,7 @@ public void testListZonesBatch() {
       assertTrue(zone.getNameServers().isEmpty());
       assertNotNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
-      zoneIterator = timeResult.get().iterateAll();
+      zoneIterator = timeResult.get().iterateAll().iterator();
       zone = zoneIterator.next();
       assertNotNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -1074,7 +1074,7 @@ public void testListZonesBatch() {
       assertTrue(zone.getNameServers().isEmpty());
       assertNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
-      zoneIterator = dnsNameResult.get().iterateAll();
+      zoneIterator = dnsNameResult.get().iterateAll().iterator();
       zone = zoneIterator.next();
       assertNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -1084,7 +1084,7 @@ public void testListZonesBatch() {
       assertTrue(zone.getNameServers().isEmpty());
       assertNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
-      zoneIterator = descriptionResult.get().iterateAll();
+      zoneIterator = descriptionResult.get().iterateAll().iterator();
       zone = zoneIterator.next();
       assertNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -1094,7 +1094,7 @@ public void testListZonesBatch() {
       assertTrue(zone.getNameServers().isEmpty());
       assertNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
-      zoneIterator = nameServersResult.get().iterateAll();
+      zoneIterator = nameServersResult.get().iterateAll().iterator();
       zone = zoneIterator.next();
       assertNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -1104,7 +1104,7 @@ public void testListZonesBatch() {
       assertFalse(zone.getNameServers().isEmpty());
       assertNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
-      zoneIterator = nameServerSetResult.get().iterateAll();
+      zoneIterator = nameServerSetResult.get().iterateAll().iterator();
       zone = zoneIterator.next();
       assertNull(zone.getCreationTimeMillis());
       assertNotNull(zone.getName());
@@ -1115,7 +1115,7 @@ public void testListZonesBatch() {
       assertNull(zone.getGeneratedId());
       assertFalse(zoneIterator.hasNext());
       // several combined
-      zones = filter(combinationResult.get().iterateAll());
+      zones = filter(combinationResult.get().iterateAll().iterator());
       assertEquals(2, zones.size());
       for (Zone current : zones) {
         assertNull(current.getCreationTimeMillis());
@@ -1736,7 +1736,7 @@ public void testListDnsRecordSetsBatch() {
           Dns.RecordSetListOption.fields(RecordSetField.TYPE),
           Dns.RecordSetListOption.pageSize(1));
       batch.submit();
-      Iterator recordSetIterator = ttlResult.get().iterateAll();
+      Iterator recordSetIterator = ttlResult.get().iterateAll().iterator();
       int counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -1747,7 +1747,7 @@ public void testListDnsRecordSetsBatch() {
         counter++;
       }
       assertEquals(2, counter);
-      recordSetIterator = nameResult.get().iterateAll();
+      recordSetIterator = nameResult.get().iterateAll().iterator();
       counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -1758,7 +1758,7 @@ public void testListDnsRecordSetsBatch() {
         counter++;
       }
       assertEquals(2, counter);
-      recordSetIterator = recordsResult.get().iterateAll();
+      recordSetIterator = recordsResult.get().iterateAll().iterator();
       counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -1769,7 +1769,7 @@ public void testListDnsRecordSetsBatch() {
         counter++;
       }
       assertEquals(2, counter);
-      recordSetIterator = pageSizeResult.get().iterateAll(); // also test paging
+      recordSetIterator = pageSizeResult.get().iterateAll().iterator(); // also test paging
       counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -1790,7 +1790,7 @@ public void testListDnsRecordSetsBatch() {
       result = batch.listRecordSets(ZONE1.getName(),
           Dns.RecordSetListOption.dnsName(A_RECORD_ZONE1.getName()));
       batch.submit();
-      recordSetIterator = result.get().iterateAll();
+      recordSetIterator = result.get().iterateAll().iterator();
       counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();
@@ -1805,7 +1805,7 @@ public void testListDnsRecordSetsBatch() {
           Dns.RecordSetListOption.dnsName(A_RECORD_ZONE1.getName()),
           Dns.RecordSetListOption.type(A_RECORD_ZONE1.getType()));
       batch.submit();
-      recordSetIterator = result.get().iterateAll();
+      recordSetIterator = result.get().iterateAll().iterator();
       counter = 0;
       while (recordSetIterator.hasNext()) {
         RecordSet recordSet = recordSetIterator.next();

From e0e53de5cae66b18f988a4cb89254740383234cc Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Tue, 11 Apr 2017 10:34:00 -0700
Subject: [PATCH 12/15] Update tests for logging, resourcemanager, spanner,
 storage

---
 .../google/cloud/logging/BaseSystemTest.java  | 28 +++----
 .../google/cloud/logging/LoggingImplTest.java | 84 +++++++++----------
 .../ResourceManagerImplTest.java              | 12 +--
 .../cloud/spanner/IntegrationTestEnv.java     |  2 +-
 .../cloud/spanner/it/ITDatabaseAdminTest.java |  4 +-
 .../cloud/spanner/it/ITInstanceAdminTest.java |  5 +-
 .../com/google/cloud/storage/BucketTest.java  |  4 +-
 .../google/cloud/storage/StorageImplTest.java | 24 +++---
 .../cloud/storage/it/ITStorageTest.java       | 22 ++---
 9 files changed, 93 insertions(+), 92 deletions(-)

diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
index 9ec649200988..3af0f044dd4f 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
@@ -22,10 +22,10 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import com.google.cloud.AsyncPage;
+import com.google.api.gax.core.AsyncPage;
 import com.google.cloud.MonitoredResource;
 import com.google.cloud.MonitoredResourceDescriptor;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.logging.Logging.EntryListOption;
 import com.google.cloud.logging.Logging.SortingField;
 import com.google.cloud.logging.Logging.SortingOrder;
@@ -202,7 +202,7 @@ public void testListSinksAsync() throws ExecutionException, InterruptedException
   @Test
   public void testListMonitoredResourceDescriptors() {
     Iterator iterator =
-        logging().listMonitoredResourceDescriptors(Logging.ListOption.pageSize(1)).iterateAll();
+        logging().listMonitoredResourceDescriptors(Logging.ListOption.pageSize(1)).iterateAll().iterator();
     int count = 0;
     while (iterator.hasNext()) {
       assertNotNull(iterator.next().getType());
@@ -215,7 +215,7 @@ public void testListMonitoredResourceDescriptors() {
   public void testListMonitoredResourceDescriptorsAsync()
       throws ExecutionException, InterruptedException {
     Iterator iterator = logging()
-        .listMonitoredResourceDescriptorsAsync(Logging.ListOption.pageSize(1)).get().iterateAll();
+        .listMonitoredResourceDescriptorsAsync(Logging.ListOption.pageSize(1)).get().iterateAll().iterator();
     int count = 0;
     while (iterator.hasNext()) {
       assertNotNull(iterator.next().getType());
@@ -357,11 +357,11 @@ public void testWriteAndListLogEntries() throws InterruptedException {
     logging().write(ImmutableList.of(secondEntry));
     EntryListOption[] options = {EntryListOption.filter(filter), EntryListOption.pageSize(1)};
     Page page = logging().listLogEntries(options);
-    while (Iterators.size(page.iterateAll()) < 2) {
+    while (Iterators.size(page.iterateAll().iterator()) < 2) {
       Thread.sleep(500);
       page = logging().listLogEntries(options);
     }
-    Iterator iterator = page.iterateAll();
+    Iterator iterator = page.iterateAll().iterator();
     assertTrue(iterator.hasNext());
     LogEntry entry = iterator.next();
     assertEquals(firstPayload, entry.getPayload());
@@ -387,11 +387,11 @@ public void testWriteAndListLogEntries() throws InterruptedException {
     options = new EntryListOption[]{EntryListOption.filter(filter),
         EntryListOption.sortOrder(SortingField.TIMESTAMP, SortingOrder.DESCENDING)};
     page = logging().listLogEntries(options);
-    while (Iterators.size(page.iterateAll()) < 2) {
+    while (Iterators.size(page.iterateAll().iterator()) < 2) {
       Thread.sleep(500);
       page = logging().listLogEntries(options);
     }
-    iterator = page.iterateAll();
+    iterator = page.iterateAll().iterator();
     Long lastTimestamp = iterator.next().getTimestamp();
     while (iterator.hasNext()) {
       assertTrue(iterator.next().getTimestamp() <= lastTimestamp);
@@ -415,11 +415,11 @@ public void testWriteAndListLogEntriesAsync() throws InterruptedException, Execu
         WriteOption.logName(logName)).get();
     EntryListOption[] options = {EntryListOption.filter(filter), EntryListOption.pageSize(1)};
     AsyncPage page = logging().listLogEntriesAsync(options).get();
-    while (Iterators.size(page.iterateAll()) < 2) {
+    while (Iterators.size(page.iterateAll().iterator()) < 2) {
       Thread.sleep(500);
       page = logging().listLogEntriesAsync(options).get();
     }
-    Iterator iterator = page.iterateAll();
+    Iterator iterator = page.iterateAll().iterator();
     assertTrue(iterator.hasNext());
     LogEntry entry = iterator.next();
     assertEquals(firstPayload, entry.getPayload());
@@ -468,11 +468,11 @@ public void testLoggingHandler() throws InterruptedException {
     logger.setLevel(Level.INFO);
     logger.info("Message");
     Iterator iterator =
-        logging().listLogEntries(EntryListOption.filter("logName:" + logName)).iterateAll();
+        logging().listLogEntries(EntryListOption.filter("logName:" + logName)).iterateAll().iterator();
     while (!iterator.hasNext()) {
       Thread.sleep(500L);
       iterator =
-          logging().listLogEntries(EntryListOption.filter("logName:" + logName)).iterateAll();
+          logging().listLogEntries(EntryListOption.filter("logName:" + logName)).iterateAll().iterator();
     }
     assertTrue(iterator.hasNext());
     LogEntry entry = iterator.next();
@@ -510,11 +510,11 @@ public void testSyncLoggingHandler() throws InterruptedException {
     logger.setLevel(Level.WARNING);
     logger.warning("Message");
     Iterator iterator =
-        logging().listLogEntries(EntryListOption.filter("logName:" + logName)).iterateAll();
+        logging().listLogEntries(EntryListOption.filter("logName:" + logName)).iterateAll().iterator();
     while (!iterator.hasNext()) {
       Thread.sleep(500L);
       iterator =
-          logging().listLogEntries(EntryListOption.filter("logName:" + logName)).iterateAll();
+          logging().listLogEntries(EntryListOption.filter("logName:" + logName)).iterateAll().iterator();
     }
     assertTrue(iterator.hasNext());
     LogEntry entry = iterator.next();
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java
index b8336e40930d..dfddcb6a6ad5 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java
@@ -25,10 +25,10 @@
 
 import com.google.api.gax.core.ApiFuture;
 import com.google.api.gax.core.ApiFutures;
-import com.google.cloud.AsyncPage;
+import com.google.api.gax.core.AsyncPage;
 import com.google.cloud.MonitoredResource;
 import com.google.cloud.MonitoredResourceDescriptor;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.logging.Logging.EntryListOption;
 import com.google.cloud.logging.Logging.ListOption;
@@ -323,7 +323,7 @@ public void testListSinks() {
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listSinks();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Sink.class));
   }
 
@@ -357,10 +357,10 @@ public void testListSinksNextPage() {
     EasyMock.expect(loggingRpcMock.list(request2)).andReturn(futureResponse2);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listSinks();
-    assertEquals(cursor1, page.getNextPageCursor());
+    assertEquals(cursor1, page.getNextPageToken());
     assertArrayEquals(sinkList1.toArray(), Iterables.toArray(page.getValues(), Sink.class));
     page = page.getNextPage();
-    assertEquals(cursor2, page.getNextPageCursor());
+    assertEquals(cursor2, page.getNextPageToken());
     assertArrayEquals(sinkList2.toArray(), Iterables.toArray(page.getValues(), Sink.class));
   }
 
@@ -378,7 +378,7 @@ public void testListSinksEmpty() {
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listSinks();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertNull(page.getNextPage());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Sink.class));
   }
@@ -404,7 +404,7 @@ public void testListSinksWithOptions() {
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listSinks(ListOption.pageSize(42), ListOption.pageToken(cursor));
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Sink.class));
   }
 
@@ -425,7 +425,7 @@ public void testListSinksAsync() throws ExecutionException, InterruptedException
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listSinksAsync().get();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Sink.class));
   }
 
@@ -459,10 +459,10 @@ public void testListSinksAsyncNextPage() throws ExecutionException, InterruptedE
     EasyMock.expect(loggingRpcMock.list(request2)).andReturn(futureResponse2);
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listSinksAsync().get();
-    assertEquals(cursor1, page.getNextPageCursor());
+    assertEquals(cursor1, page.getNextPageToken());
     assertArrayEquals(sinkList1.toArray(), Iterables.toArray(page.getValues(), Sink.class));
     page = page.getNextPageAsync().get();
-    assertEquals(cursor2, page.getNextPageCursor());
+    assertEquals(cursor2, page.getNextPageToken());
     assertArrayEquals(sinkList2.toArray(), Iterables.toArray(page.getValues(), Sink.class));
   }
 
@@ -480,7 +480,7 @@ public void testListSinksAsyncEmpty() throws ExecutionException, InterruptedExce
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listSinksAsync().get();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertNull(page.getNextPage());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Sink.class));
   }
@@ -507,7 +507,7 @@ public void testListSinksWithOptionsAsync() throws ExecutionException, Interrupt
     EasyMock.replay(loggingRpcMock);
     AsyncPage page =
         logging.listSinksAsync(ListOption.pageSize(42), ListOption.pageToken(cursor)).get();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Sink.class));
   }
 
@@ -681,7 +681,7 @@ public void testListMetrics() {
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listMetrics();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Metric.class));
   }
 
@@ -716,10 +716,10 @@ public void testListMetricsNextPage() {
     EasyMock.expect(loggingRpcMock.list(request2)).andReturn(futureResponse2);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listMetrics();
-    assertEquals(cursor1, page.getNextPageCursor());
+    assertEquals(cursor1, page.getNextPageToken());
     assertArrayEquals(sinkList1.toArray(), Iterables.toArray(page.getValues(), Metric.class));
     page = page.getNextPage();
-    assertEquals(cursor2, page.getNextPageCursor());
+    assertEquals(cursor2, page.getNextPageToken());
     assertArrayEquals(sinkList2.toArray(), Iterables.toArray(page.getValues(), Metric.class));
   }
 
@@ -738,7 +738,7 @@ public void testListMetricsEmpty() {
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listMetrics();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertNull(page.getNextPage());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Metric.class));
   }
@@ -764,7 +764,7 @@ public void testListMetricsWithOptions() {
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listMetrics(ListOption.pageSize(42), ListOption.pageToken(cursor));
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Metric.class));
   }
 
@@ -786,7 +786,7 @@ public void testListMetricsAsync() throws ExecutionException, InterruptedExcepti
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listMetricsAsync().get();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Metric.class));
   }
 
@@ -821,10 +821,10 @@ public void testListMetricsAsyncNextPage() throws ExecutionException, Interrupte
     EasyMock.expect(loggingRpcMock.list(request2)).andReturn(futureResponse2);
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listMetricsAsync().get();
-    assertEquals(cursor1, page.getNextPageCursor());
+    assertEquals(cursor1, page.getNextPageToken());
     assertArrayEquals(sinkList1.toArray(), Iterables.toArray(page.getValues(), Metric.class));
     page = page.getNextPageAsync().get();
-    assertEquals(cursor2, page.getNextPageCursor());
+    assertEquals(cursor2, page.getNextPageToken());
     assertArrayEquals(sinkList2.toArray(), Iterables.toArray(page.getValues(), Metric.class));
   }
 
@@ -843,7 +843,7 @@ public void testListMetricsAsyncEmpty() throws ExecutionException, InterruptedEx
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listMetricsAsync().get();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertNull(page.getNextPage());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Metric.class));
   }
@@ -870,7 +870,7 @@ public void testListMetricsWithOptionsAsync() throws ExecutionException, Interru
     EasyMock.replay(loggingRpcMock);
     AsyncPage page =
         logging.listMetricsAsync(ListOption.pageSize(42), ListOption.pageToken(cursor)).get();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(sinkList.toArray(), Iterables.toArray(page.getValues(), Metric.class));
   }
 
@@ -892,7 +892,7 @@ public void testListResourceDescriptor() {
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listMonitoredResourceDescriptors();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(descriptorList.toArray(),
         Iterables.toArray(page.getValues(), MonitoredResourceDescriptor.class));
   }
@@ -927,11 +927,11 @@ public void testListResourceDescriptorNextPage() {
     EasyMock.expect(loggingRpcMock.list(request2)).andReturn(futureResponse2);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listMonitoredResourceDescriptors();
-    assertEquals(cursor1, page.getNextPageCursor());
+    assertEquals(cursor1, page.getNextPageToken());
     assertArrayEquals(descriptorList1.toArray(), Iterables.toArray(page.getValues(),
         MonitoredResourceDescriptor.class));
     page = page.getNextPage();
-    assertEquals(cursor2, page.getNextPageCursor());
+    assertEquals(cursor2, page.getNextPageToken());
     assertArrayEquals(descriptorList2.toArray(),
         Iterables.toArray(page.getValues(), MonitoredResourceDescriptor.class));
   }
@@ -953,7 +953,7 @@ public void testListResourceDescriptorEmpty() {
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listMonitoredResourceDescriptors();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertNull(page.getNextPage());
     assertArrayEquals(descriptorList.toArray(),
         Iterables.toArray(page.getValues(), MonitoredResourceDescriptor.class));
@@ -981,7 +981,7 @@ public void testListResourceDescriptorWithOptions() {
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listMonitoredResourceDescriptors(
         ListOption.pageSize(42), ListOption.pageToken(cursor));
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(descriptorList.toArray(),
         Iterables.toArray(page.getValues(), MonitoredResourceDescriptor.class));
   }
@@ -1005,7 +1005,7 @@ public void testListResourceDescriptorAsync() throws ExecutionException, Interru
     EasyMock.replay(loggingRpcMock);
     AsyncPage page =
         logging.listMonitoredResourceDescriptorsAsync().get();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(descriptorList.toArray(),
         Iterables.toArray(page.getValues(), MonitoredResourceDescriptor.class));
   }
@@ -1041,11 +1041,11 @@ public void testListResourceDescriptorAsyncNextPage() throws ExecutionException,
     EasyMock.replay(loggingRpcMock);
     AsyncPage page =
         logging.listMonitoredResourceDescriptorsAsync().get();
-    assertEquals(cursor1, page.getNextPageCursor());
+    assertEquals(cursor1, page.getNextPageToken());
     assertArrayEquals(descriptorList1.toArray(), Iterables.toArray(page.getValues(),
         MonitoredResourceDescriptor.class));
     page = page.getNextPageAsync().get();
-    assertEquals(cursor2, page.getNextPageCursor());
+    assertEquals(cursor2, page.getNextPageToken());
     assertArrayEquals(descriptorList2.toArray(),
         Iterables.toArray(page.getValues(), MonitoredResourceDescriptor.class));
   }
@@ -1069,7 +1069,7 @@ public void testListResourceDescriptorAsyncEmpty()
     EasyMock.replay(loggingRpcMock);
     AsyncPage page =
         logging.listMonitoredResourceDescriptorsAsync().get();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertNull(page.getNextPage());
     assertArrayEquals(descriptorList.toArray(),
         Iterables.toArray(page.getValues(), MonitoredResourceDescriptor.class));
@@ -1098,7 +1098,7 @@ public void testListResourceDescriptorAsyncWithOptions()
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listMonitoredResourceDescriptorsAsync(
         ListOption.pageSize(42), ListOption.pageToken(cursor)).get();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(descriptorList.toArray(),
         Iterables.toArray(page.getValues(), MonitoredResourceDescriptor.class));
   }
@@ -1220,7 +1220,7 @@ public void testListLogEntries() {
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listLogEntries();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(entriesList.toArray(), Iterables.toArray(page.getValues(), LogEntry.class));
   }
 
@@ -1253,11 +1253,11 @@ public void testListLogEntriesNextPage() throws ExecutionException, InterruptedE
     EasyMock.expect(loggingRpcMock.list(request2)).andReturn(futureResponse2);
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listLogEntriesAsync().get();
-    assertEquals(cursor1, page.getNextPageCursor());
+    assertEquals(cursor1, page.getNextPageToken());
     assertArrayEquals(descriptorList1.toArray(),
         Iterables.toArray(page.getValues(), LogEntry.class));
     page = page.getNextPageAsync().get();
-    assertEquals(cursor2, page.getNextPageCursor());
+    assertEquals(cursor2, page.getNextPageToken());
     assertArrayEquals(descriptorList2.toArray(),
         Iterables.toArray(page.getValues(), LogEntry.class));
   }
@@ -1279,7 +1279,7 @@ public void testListLogEntriesEmpty() {
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listLogEntries();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(entriesList.toArray(), Iterables.toArray(page.getValues(), LogEntry.class));
   }
 
@@ -1303,7 +1303,7 @@ public void testListLogEntriesWithOptions() {
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listLogEntries(EntryListOption.filter("logName:syslog"),
         EntryListOption.sortOrder(SortingField.TIMESTAMP, Logging.SortingOrder.DESCENDING));
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(entriesList.toArray(), Iterables.toArray(page.getValues(), LogEntry.class));
   }
 
@@ -1324,7 +1324,7 @@ public void testListLogEntriesAsync() throws ExecutionException, InterruptedExce
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listLogEntriesAsync().get();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(entriesList.toArray(), Iterables.toArray(page.getValues(), LogEntry.class));
   }
 
@@ -1357,11 +1357,11 @@ public void testListLogEntriesAsyncNextPage() {
     EasyMock.expect(loggingRpcMock.list(request2)).andReturn(futureResponse2);
     EasyMock.replay(loggingRpcMock);
     Page page = logging.listLogEntries();
-    assertEquals(cursor1, page.getNextPageCursor());
+    assertEquals(cursor1, page.getNextPageToken());
     assertArrayEquals(descriptorList1.toArray(),
         Iterables.toArray(page.getValues(), LogEntry.class));
     page = page.getNextPage();
-    assertEquals(cursor2, page.getNextPageCursor());
+    assertEquals(cursor2, page.getNextPageToken());
     assertArrayEquals(descriptorList2.toArray(),
         Iterables.toArray(page.getValues(), LogEntry.class));
   }
@@ -1383,7 +1383,7 @@ public void testListLogEntriesAyncEmpty() throws ExecutionException, Interrupted
     EasyMock.expect(loggingRpcMock.list(request)).andReturn(futureResponse);
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listLogEntriesAsync().get();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(entriesList.toArray(), Iterables.toArray(page.getValues(), LogEntry.class));
   }
 
@@ -1407,7 +1407,7 @@ public void testListLogEntriesAsyncWithOptions() throws ExecutionException, Inte
     EasyMock.replay(loggingRpcMock);
     AsyncPage page = logging.listLogEntriesAsync(EntryListOption.filter("logName:syslog"),
         EntryListOption.sortOrder(SortingField.TIMESTAMP, Logging.SortingOrder.DESCENDING)).get();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(entriesList.toArray(), Iterables.toArray(page.getValues(), LogEntry.class));
   }
 }
diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java
index cdeb6d4160cd..2a646943d3e4 100644
--- a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java
+++ b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java
@@ -26,7 +26,7 @@
 import static org.junit.Assert.fail;
 
 import com.google.cloud.Identity;
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.Policy;
 import com.google.cloud.Role;
 import com.google.cloud.resourcemanager.ProjectInfo.ResourceId;
@@ -198,7 +198,7 @@ public void testListPaging() {
     RESOURCE_MANAGER.create(PARTIAL_PROJECT);
     RESOURCE_MANAGER.create(COMPLETE_PROJECT);
     Page page = RESOURCE_MANAGER.list(ProjectListOption.pageSize(1));
-    assertNotNull(page.getNextPageCursor());
+    assertNotNull(page.getNextPageToken());
     Iterator iterator = page.getValues().iterator();
     compareReadWriteFields(COMPLETE_PROJECT, iterator.next());
     assertFalse(iterator.hasNext());
@@ -206,14 +206,14 @@ public void testListPaging() {
     iterator = page.getValues().iterator();
     compareReadWriteFields(PARTIAL_PROJECT, iterator.next());
     assertFalse(iterator.hasNext());
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
   }
 
   @Test
   public void testListFieldOptions() {
     RESOURCE_MANAGER.create(COMPLETE_PROJECT);
     Page projects = RESOURCE_MANAGER.list(LIST_FIELDS);
-    Project returnedProject = projects.iterateAll().next();
+    Project returnedProject = projects.iterateAll().iterator().next();
     assertEquals(COMPLETE_PROJECT.getProjectId(), returnedProject.getProjectId());
     assertEquals(COMPLETE_PROJECT.getName(), returnedProject.getName());
     assertEquals(COMPLETE_PROJECT.getLabels(), returnedProject.getLabels());
@@ -229,7 +229,7 @@ public void testListPagingWithFieldOptions() {
     RESOURCE_MANAGER.create(PARTIAL_PROJECT);
     RESOURCE_MANAGER.create(COMPLETE_PROJECT);
     Page projects = RESOURCE_MANAGER.list(LIST_FIELDS, ProjectListOption.pageSize(1));
-    assertNotNull(projects.getNextPageCursor());
+    assertNotNull(projects.getNextPageToken());
     Iterator iterator = projects.getValues().iterator();
     Project returnedProject = iterator.next();
     assertEquals(COMPLETE_PROJECT.getProjectId(), returnedProject.getProjectId());
@@ -253,7 +253,7 @@ public void testListPagingWithFieldOptions() {
     assertNull(returnedProject.getCreateTimeMillis());
     assertSame(RESOURCE_MANAGER, returnedProject.getResourceManager());
     assertFalse(iterator.hasNext());
-    assertNull(projects.getNextPageCursor());
+    assertNull(projects.getNextPageToken());
   }
 
   @Test
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java
index 0afb6cf5de70..62150b836f77 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java
@@ -102,7 +102,7 @@ protected void after() {
 
   private void initializeInstance(InstanceId instanceId) {
     InstanceConfig instanceConfig =
-        Iterators.get(instanceAdminClient.listInstanceConfigs().iterateAll(), 0, null);
+        Iterators.get(instanceAdminClient.listInstanceConfigs().iterateAll().iterator(), 0, null);
     checkState(instanceConfig != null, "No instance configs found");
 
     InstanceConfigId configId = instanceConfig.getId();
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java
index f4e994c79407..1f315426faf0 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java
@@ -19,7 +19,7 @@
 import static com.google.cloud.spanner.SpannerMatchers.isSpannerException;
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.spanner.Database;
 import com.google.cloud.spanner.DatabaseAdminClient;
 import com.google.cloud.spanner.ErrorCode;
@@ -86,7 +86,7 @@ public void databaseOperations() throws Exception {
 
     boolean foundDb = false;
     for (Database dbInList :
-        Iterators.toArray(dbAdminClient.listDatabases(instanceId).iterateAll(), Database.class)) {
+        Iterators.toArray(dbAdminClient.listDatabases(instanceId).iterateAll().iterator(), Database.class)) {
       if (dbInList.getId().getDatabase().equals(dbId)) {
         foundDb = true;
         break;
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java
index 7e3b3e7d2dd1..c6d46ce92f02 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java
@@ -56,7 +56,7 @@ public void setUp() {
   @Test
   public void instanceConfigOperations() {
     List configs = new ArrayList<>();
-    Iterators.addAll(configs, instanceClient.listInstanceConfigs().iterateAll());
+    Iterators.addAll(configs, instanceClient.listInstanceConfigs().iterateAll().iterator());
     assertThat(configs.isEmpty()).isFalse();
     InstanceConfig config =
         instanceClient.getInstanceConfig(configs.get(0).getId().getInstanceConfig());
@@ -73,7 +73,8 @@ public void listInstances() throws Exception {
                 .listInstances(
                     Options.filter(
                         "name:instances/" + env.getTestHelper().getInstanceId().getInstance()))
-                .iterateAll());
+                .iterateAll()
+                .iterator());
     assertThat(instance.getId()).isEqualTo(env.getTestHelper().getInstanceId());
   }
 
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java
index 83ea7e3b6aa7..fe8346700730 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java
@@ -27,7 +27,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.PageImpl;
 import com.google.cloud.storage.Acl.Project;
 import com.google.cloud.storage.Acl.Project.ProjectRole;
@@ -237,7 +237,7 @@ public void testList() throws Exception {
     }
     assertFalse(blobInfoIterator.hasNext());
     assertFalse(blobIterator.hasNext());
-    assertEquals(expectedBlobPage.getNextPageCursor(), blobPage.getNextPageCursor());
+    assertEquals(expectedBlobPage.getNextPageToken(), blobPage.getNextPageToken());
   }
 
   @Test
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
index 84628c7dba7f..c6b0804a95ce 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
@@ -27,9 +27,9 @@
 
 import com.google.api.client.googleapis.json.GoogleJsonError;
 import com.google.api.gax.core.ApiClock;
+import com.google.api.gax.core.Page;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.auth.oauth2.ServiceAccountCredentials;
-import com.google.cloud.Page;
 import com.google.cloud.ReadChannel;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.WriteChannel;
@@ -676,7 +676,7 @@ public void testListBuckets() {
     initializeService();
     ImmutableList bucketList = ImmutableList.of(expectedBucket1, expectedBucket2);
     Page page = storage.list();
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(bucketList.toArray(), Iterables.toArray(page.getValues(), Bucket.class));
   }
 
@@ -688,7 +688,7 @@ public void testListBucketsEmpty() {
     EasyMock.replay(storageRpcMock);
     initializeService();
     Page page = storage.list();
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(
         ImmutableList.of().toArray(), Iterables.toArray(page.getValues(), Bucket.class));
   }
@@ -704,7 +704,7 @@ public void testListBucketsWithOptions() {
     initializeService();
     ImmutableList bucketList = ImmutableList.of(expectedBucket1, expectedBucket2);
     Page page = storage.list(BUCKET_LIST_PAGE_SIZE, BUCKET_LIST_PREFIX);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(bucketList.toArray(), Iterables.toArray(page.getValues(), Bucket.class));
   }
 
@@ -728,7 +728,7 @@ public void testListBucketsWithSelectedFields() {
     assertTrue(selector.contains("nextPageToken"));
     assertTrue(selector.endsWith(")"));
     assertEquals(38, selector.length());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(bucketList.toArray(), Iterables.toArray(page.getValues(), Bucket.class));
   }
 
@@ -751,7 +751,7 @@ public void testListBucketsWithEmptyFields() {
     assertTrue(selector.contains("nextPageToken"));
     assertTrue(selector.endsWith(")"));
     assertEquals(25, selector.length());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(bucketList.toArray(), Iterables.toArray(page.getValues(), Bucket.class));
   }
 
@@ -766,7 +766,7 @@ public void testListBlobs() {
     initializeService();
     ImmutableList blobList = ImmutableList.of(expectedBlob1, expectedBlob2);
     Page page = storage.list(BUCKET_NAME1);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(blobList.toArray(), Iterables.toArray(page.getValues(), Blob.class));
   }
 
@@ -779,7 +779,7 @@ public void testListBlobsEmpty() {
     EasyMock.replay(storageRpcMock);
     initializeService();
     Page page = storage.list(BUCKET_NAME1);
-    assertNull(page.getNextPageCursor());
+    assertNull(page.getNextPageToken());
     assertArrayEquals(
         ImmutableList.of().toArray(), Iterables.toArray(page.getValues(), Blob.class));
   }
@@ -796,7 +796,7 @@ public void testListBlobsWithOptions() {
     ImmutableList blobList = ImmutableList.of(expectedBlob1, expectedBlob2);
     Page page =
         storage.list(BUCKET_NAME1, BLOB_LIST_PAGE_SIZE, BLOB_LIST_PREFIX, BLOB_LIST_VERSIONS);
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(blobList.toArray(), Iterables.toArray(page.getValues(), Blob.class));
   }
 
@@ -831,7 +831,7 @@ public void testListBlobsWithSelectedFields() {
     assertTrue(selector.contains("nextPageToken"));
     assertTrue(selector.endsWith(")"));
     assertEquals(61, selector.length());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(blobList.toArray(), Iterables.toArray(page.getValues(), Blob.class));
   }
 
@@ -865,7 +865,7 @@ public void testListBlobsWithEmptyFields() {
     assertTrue(selector.contains("nextPageToken"));
     assertTrue(selector.endsWith(")"));
     assertEquals(41, selector.length());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(blobList.toArray(), Iterables.toArray(page.getValues(), Blob.class));
   }
 
@@ -881,7 +881,7 @@ public void testListBlobsCurrentDirectory() {
     initializeService();
     ImmutableList blobList = ImmutableList.of(expectedBlob1, expectedBlob2);
     Page page = storage.list(BUCKET_NAME1, Storage.BlobListOption.currentDirectory());
-    assertEquals(cursor, page.getNextPageCursor());
+    assertEquals(cursor, page.getNextPageToken());
     assertArrayEquals(blobList.toArray(), Iterables.toArray(page.getValues(), Blob.class));
   }
 
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
index 48ae816e8c3d..bbb99e2ed62d 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
@@ -25,7 +25,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.ReadChannel;
 import com.google.cloud.RestorableState;
 import com.google.cloud.WriteChannel;
@@ -122,11 +122,11 @@ public static void afterClass() throws ExecutionException, InterruptedException
   @Test(timeout = 5000)
   public void testListBuckets() throws InterruptedException {
     Iterator bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
-        Storage.BucketListOption.fields()).iterateAll();
+        Storage.BucketListOption.fields()).iterateAll().iterator();
     while (!bucketIterator.hasNext()) {
       Thread.sleep(500);
       bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
-          Storage.BucketListOption.fields()).iterateAll();
+          Storage.BucketListOption.fields()).iterateAll().iterator();
     }
     while (bucketIterator.hasNext()) {
       Bucket remoteBucket = bucketIterator.next();
@@ -344,14 +344,14 @@ public void testListBlobsSelectedFields() throws InterruptedException {
         Storage.BlobListOption.fields(BlobField.METADATA));
     // Listing blobs is eventually consistent, we loop until the list is of the expected size. The
     // test fails if timeout is reached.
-    while (Iterators.size(page.iterateAll()) != 2) {
+    while (Iterators.size(page.iterateAll().iterator()) != 2) {
       Thread.sleep(500);
       page = storage.list(BUCKET,
           Storage.BlobListOption.prefix("test-list-blobs-selected-fields-blob"),
           Storage.BlobListOption.fields(BlobField.METADATA));
     }
     Set blobSet = ImmutableSet.of(blobNames[0], blobNames[1]);
-    Iterator iterator = page.iterateAll();
+    Iterator iterator = page.iterateAll().iterator();
     while (iterator.hasNext()) {
       Blob remoteBlob = iterator.next();
       assertEquals(BUCKET, remoteBlob.getBucket());
@@ -382,14 +382,14 @@ public void testListBlobsEmptySelectedFields() throws InterruptedException {
         Storage.BlobListOption.fields());
     // Listing blobs is eventually consistent, we loop until the list is of the expected size. The
     // test fails if timeout is reached.
-    while (Iterators.size(page.iterateAll()) != 2) {
+    while (Iterators.size(page.iterateAll().iterator()) != 2) {
       Thread.sleep(500);
       page = storage.list(BUCKET,
           Storage.BlobListOption.prefix("test-list-blobs-empty-selected-fields-blob"),
           Storage.BlobListOption.fields());
     }
     Set blobSet = ImmutableSet.of(blobNames[0], blobNames[1]);
-    Iterator iterator = page.iterateAll();
+    Iterator iterator = page.iterateAll().iterator();
     while (iterator.hasNext()) {
       Blob remoteBlob = iterator.next();
       assertEquals(BUCKET, remoteBlob.getBucket());
@@ -424,14 +424,14 @@ public void testListBlobsVersioned() throws ExecutionException, InterruptedExcep
           Storage.BlobListOption.versions(true));
       // Listing blobs is eventually consistent, we loop until the list is of the expected size. The
       // test fails if timeout is reached.
-      while (Iterators.size(page.iterateAll()) != 3) {
+      while (Iterators.size(page.iterateAll().iterator()) != 3) {
         Thread.sleep(500);
         page = storage.list(bucketName,
             Storage.BlobListOption.prefix("test-list-blobs-versioned-blob"),
             Storage.BlobListOption.versions(true));
       }
       Set blobSet = ImmutableSet.of(blobNames[0], blobNames[1]);
-      Iterator iterator = page.iterateAll();
+      Iterator iterator = page.iterateAll().iterator();
       while (iterator.hasNext()) {
         Blob remoteBlob = iterator.next();
         assertEquals(bucketName, remoteBlob.getBucket());
@@ -467,13 +467,13 @@ public void testListBlobsCurrentDirectory() throws InterruptedException {
         Storage.BlobListOption.currentDirectory());
     // Listing blobs is eventually consistent, we loop until the list is of the expected size. The
     // test fails if timeout is reached.
-    while (Iterators.size(page.iterateAll()) != 2) {
+    while (Iterators.size(page.iterateAll().iterator()) != 2) {
       Thread.sleep(500);
       page = storage.list(BUCKET,
           Storage.BlobListOption.prefix("test-list-blobs-current-directory/"),
           Storage.BlobListOption.currentDirectory());
     }
-    Iterator iterator = page.iterateAll();
+    Iterator iterator = page.iterateAll().iterator();
     while (iterator.hasNext()) {
       Blob remoteBlob = iterator.next();
       assertEquals(BUCKET, remoteBlob.getBucket());

From 57ade50f82d21adfbdca94924cd774e7f50a536a Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Tue, 11 Apr 2017 10:41:21 -0700
Subject: [PATCH 13/15] Update tests in examples

---
 .../bigquery/snippets/ITBigQuerySnippets.java | 24 +++++++++----------
 .../bigquery/snippets/ITDatasetSnippets.java  |  6 ++---
 .../bigquery/snippets/ITTableSnippets.java    |  2 +-
 .../logging/snippets/ITLoggingSnippets.java   | 12 +++++-----
 .../ITSubscriptionAdminClientSnippets.java    |  2 +-
 .../snippets/ITTopicAdminClientSnippets.java  |  4 ++--
 .../storage/snippets/ITBlobSnippets.java      |  2 +-
 .../storage/snippets/ITStorageSnippets.java   | 10 ++++----
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITBigQuerySnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITBigQuerySnippets.java
index 98c8557567a2..896d71f020c2 100644
--- a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITBigQuerySnippets.java
+++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITBigQuerySnippets.java
@@ -22,7 +22,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption;
 import com.google.cloud.bigquery.Dataset;
@@ -124,21 +124,21 @@ public void testCreateGetAndDeleteTable() throws InterruptedException {
     assertEquals("new friendly name", bigquerySnippets.getTableFromId(
         tableId.getProject(), tableId.getDataset(), tableId.getTable()).getFriendlyName());
     Set tables = Sets.newHashSet(
-        Iterators.transform(bigquerySnippets.listTables(DATASET).iterateAll(),
+        Iterators.transform(bigquerySnippets.listTables(DATASET).iterateAll().iterator(),
         TO_TABLE_ID_FUNCTION));
     while (!tables.contains(tableId)) {
       Thread.sleep(500);
       tables = Sets.newHashSet(
-          Iterators.transform(bigquerySnippets.listTables(DATASET).iterateAll(),
+          Iterators.transform(bigquerySnippets.listTables(DATASET).iterateAll().iterator(),
               TO_TABLE_ID_FUNCTION));
     }
     tables = Sets.newHashSet(Iterators.transform(
-        bigquerySnippets.listTablesFromId(tableId.getProject(), DATASET).iterateAll(),
+        bigquerySnippets.listTablesFromId(tableId.getProject(), DATASET).iterateAll().iterator(),
         TO_TABLE_ID_FUNCTION));
     while (!tables.contains(tableId)) {
       Thread.sleep(500);
       tables = Sets.newHashSet(Iterators.transform(
-          bigquerySnippets.listTablesFromId(tableId.getProject(), DATASET).iterateAll(),
+          bigquerySnippets.listTablesFromId(tableId.getProject(), DATASET).iterateAll().iterator(),
           TO_TABLE_ID_FUNCTION));
     }
     assertTrue(bigquerySnippets.deleteTable(DATASET, tableName));
@@ -155,21 +155,21 @@ public void testCreateGetAndDeleteDataset() throws InterruptedException {
     assertEquals("new friendly name",
         bigquerySnippets.getDatasetFromId(datasetId.getProject(), OTHER_DATASET).getFriendlyName());
     Set datasets = Sets.newHashSet(
-        Iterators.transform(bigquerySnippets.listDatasets().iterateAll(),
+        Iterators.transform(bigquerySnippets.listDatasets().iterateAll().iterator(),
             TO_DATASET_ID_FUNCTION));
     while (!datasets.contains(datasetId)) {
       Thread.sleep(500);
       datasets = Sets.newHashSet(
-          Iterators.transform(bigquerySnippets.listDatasets().iterateAll(),
+          Iterators.transform(bigquerySnippets.listDatasets().iterateAll().iterator(),
               TO_DATASET_ID_FUNCTION));
     }
     datasets = Sets.newHashSet(
-        Iterators.transform(bigquerySnippets.listDatasets(datasetId.getProject()).iterateAll(),
+        Iterators.transform(bigquerySnippets.listDatasets(datasetId.getProject()).iterateAll().iterator(),
             TO_DATASET_ID_FUNCTION));
     while (!datasets.contains(datasetId)) {
       Thread.sleep(500);
       datasets = Sets.newHashSet(
-          Iterators.transform(bigquerySnippets.listDatasets(datasetId.getProject()).iterateAll(),
+          Iterators.transform(bigquerySnippets.listDatasets(datasetId.getProject()).iterateAll().iterator(),
               TO_DATASET_ID_FUNCTION));
     }
     assertTrue(bigquerySnippets.deleteDataset(OTHER_DATASET));
@@ -221,7 +221,7 @@ public void testInsertAllAndListTableData() throws IOException, InterruptedExcep
     assertFalse(response.hasErrors());
     assertTrue(response.getInsertErrors().isEmpty());
     Page> listPage = bigquerySnippets.listTableDataFromId(DATASET, tableName);
-    while (Iterators.size(listPage.iterateAll()) < 1) {
+    while (Iterators.size(listPage.iterateAll().iterator()) < 1) {
       Thread.sleep(500);
       listPage = bigquerySnippets.listTableDataFromId(DATASET, tableName);
     }
@@ -241,11 +241,11 @@ public void testJob() throws ExecutionException, InterruptedException {
     assertEquals(job1.getJobId(), bigquerySnippets.getJob(job1.getJobId().getJob()).getJobId());
     assertEquals(job2.getJobId(),
         bigquerySnippets.getJobFromId(job2.getJobId().getJob()).getJobId());
-    Set jobs = Sets.newHashSet(Iterators.transform(bigquerySnippets.listJobs().iterateAll(),
+    Set jobs = Sets.newHashSet(Iterators.transform(bigquerySnippets.listJobs().iterateAll().iterator(),
         TO_JOB_ID_FUNCTION));
     while (!jobs.contains(job1.getJobId()) || !jobs.contains(job2.getJobId())) {
       Thread.sleep(500);
-      jobs = Sets.newHashSet(Iterators.transform(bigquerySnippets.listJobs().iterateAll(),
+      jobs = Sets.newHashSet(Iterators.transform(bigquerySnippets.listJobs().iterateAll().iterator(),
           TO_JOB_ID_FUNCTION));
     }
     assertTrue(bigquerySnippets.cancelJob(job1.getJobId().getJob()));
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetSnippets.java
index 661e1e437c84..38d372f70881 100644
--- a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetSnippets.java
+++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetSnippets.java
@@ -22,7 +22,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption;
 import com.google.cloud.bigquery.Dataset;
@@ -122,7 +122,7 @@ public void testDelete() {
   @Test
   public void testListTablesEmpty() {
     Page
 tables = datasetSnippets.list();
-    assertFalse(tables.iterateAll().hasNext());
+    assertFalse(tables.iterateAll().iterator().hasNext());
   }
 
   @Test
@@ -131,7 +131,7 @@ public void testListTablesNotEmpty() {
 
     dataset.create(expectedTableName, StandardTableDefinition.newBuilder().build());
     Page
 tables = datasetSnippets.list();
-    Iterator
 iterator = tables.iterateAll();
+    Iterator
 iterator = tables.iterateAll().iterator();
     assertTrue(iterator.hasNext());
 
     Table actualTable = iterator.next();
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITTableSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITTableSnippets.java
index eb6e393a8f7a..f145b0222772 100644
--- a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITTableSnippets.java
+++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITTableSnippets.java
@@ -22,7 +22,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.BigQuery.TableDataListOption;
 import com.google.cloud.bigquery.BigQuery.TableField;
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/logging/snippets/ITLoggingSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/logging/snippets/ITLoggingSnippets.java
index c908e8811d2f..932015a296ed 100644
--- a/google-cloud-examples/src/test/java/com/google/cloud/examples/logging/snippets/ITLoggingSnippets.java
+++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/logging/snippets/ITLoggingSnippets.java
@@ -125,14 +125,14 @@ public void testMetric() throws ExecutionException, InterruptedException {
   @Test
   public void testMonitoredResourceDescriptor() throws ExecutionException, InterruptedException {
     Iterator iterator =
-        loggingSnippets.listMonitoredResourceDescriptors().iterateAll();
+        loggingSnippets.listMonitoredResourceDescriptors().iterateAll().iterator();
     int count = 0;
     while (iterator.hasNext()) {
       assertNotNull(iterator.next().getType());
       count += 1;
     }
     assertTrue(count > 0);
-    iterator = loggingSnippets.listMonitoredResourceDescriptorsAsync().iterateAll();
+    iterator = loggingSnippets.listMonitoredResourceDescriptorsAsync().iterateAll().iterator();
     count = 0;
     while (iterator.hasNext()) {
       assertNotNull(iterator.next().getType());
@@ -146,10 +146,10 @@ public void testWriteAndListLogEntries() throws InterruptedException {
     String logName = RemoteLoggingHelper.formatForTest("log_name");
     String filter = "logName=projects/" + logging.getOptions().getProjectId() + "/logs/" + logName;
     loggingSnippets.write(logName);
-    Iterator iterator = loggingSnippets.listLogEntries(filter).iterateAll();
+    Iterator iterator = loggingSnippets.listLogEntries(filter).iterateAll().iterator();
     while (Iterators.size(iterator) < 2) {
       Thread.sleep(500);
-      iterator = loggingSnippets.listLogEntries(filter).iterateAll();
+      iterator = loggingSnippets.listLogEntries(filter).iterateAll().iterator();
     }
     assertTrue(loggingSnippets.deleteLog(logName));
   }
@@ -159,10 +159,10 @@ public void testWriteAndListLogEntriesAsync() throws ExecutionException, Interru
     String logName = RemoteLoggingHelper.formatForTest("log_name");
     String filter = "logName=projects/" + logging.getOptions().getProjectId() + "/logs/" + logName;
     loggingSnippets.writeAsync(logName).get();
-    Iterator iterator = loggingSnippets.listLogEntriesAsync(filter).iterateAll();
+    Iterator iterator = loggingSnippets.listLogEntriesAsync(filter).iterateAll().iterator();
     while (Iterators.size(iterator) < 2) {
       Thread.sleep(500);
-      iterator = loggingSnippets.listLogEntriesAsync(filter).iterateAll();
+      iterator = loggingSnippets.listLogEntriesAsync(filter).iterateAll().iterator();
     }
     assertTrue(loggingSnippets.deleteLogAsync(logName));
   }
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java
index 82de90561295..f23b1d7a211c 100644
--- a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java
+++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java
@@ -139,7 +139,7 @@ public void listSubscriptionsRetrievesAllAddedSubscriptions() throws Exception {
     boolean[] subFound = {false, false};
     ListSubscriptionsPagedResponse response = subscriptionAdminClientSnippets.listSubscriptions();
     assertNotNull(response);
-    Iterable subscriptions = response.iterateAllElements();
+    Iterable subscriptions = response.iterateAll();
     for (int i = 0; i < 2; i++) {
         if (!subFound[i]) {
           subFound[i] = Iterables.contains(subscriptions, addedSubscriptions.get(i));
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicAdminClientSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicAdminClientSnippets.java
index c3cd9cffc86e..76b641654e38 100644
--- a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicAdminClientSnippets.java
+++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicAdminClientSnippets.java
@@ -100,7 +100,7 @@ public void listTopicsRetreivesAddedTopics() throws Exception {
     ListTopicsPagedResponse response = topicAdminClientSnippets.listTopics();
 
     assertNotNull(response);
-    Iterable topics = response.iterateAllElements();
+    Iterable topics = response.iterateAll();
     for (int i = 0; i < 2; i++) {
       if (!topicFound[i]) {
         topicFound[i] = Iterables.contains(topics, addedTopics.get(i));
@@ -127,7 +127,7 @@ public void listTopicSubscriptionsRetrievesAddedSubscriptions() throws Exception
 
 
     assertNotNull(response);
-    Iterable subscriptions = response.iterateAllElements();
+    Iterable subscriptions = response.iterateAll();
     for (int i = 0; i < 2; i++) {
       if (!subFound[i]) {
         subFound[i] = Iterables.contains(subscriptions, addedSubscriptions.get(i));
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITBlobSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITBlobSnippets.java
index 4998cb0c00cc..d2e65dfc40c8 100644
--- a/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITBlobSnippets.java
+++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITBlobSnippets.java
@@ -161,7 +161,7 @@ public void testMoveBlob() throws IOException {
     assertNotNull(movedBlob);
 
     // Assert that the destination blob exists
-    Iterator blobs = storage.list(BUCKET).iterateAll();
+    Iterator blobs = storage.list(BUCKET).iterateAll().iterator();
     Blob moveBlob = blobs.next();
     assertEquals(BUCKET, moveBlob.getBucket());
     assertEquals("moveBlob", moveBlob.getName());
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITStorageSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITStorageSnippets.java
index c81f3ada51b0..b13cb2d909ff 100644
--- a/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITStorageSnippets.java
+++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITStorageSnippets.java
@@ -25,7 +25,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.cloud.Page;
+import com.google.api.gax.core.Page;
 import com.google.cloud.storage.Acl;
 import com.google.cloud.storage.Acl.Role;
 import com.google.cloud.storage.Acl.User;
@@ -124,12 +124,12 @@ public void testBlob() throws InterruptedException {
     Blob copiedBlob = storageSnippets.copyBlob(BUCKET, blobName, "directory/copy-blob");
     assertNotNull(copiedBlob);
     Page blobs = storageSnippets.listBlobsWithDirectoryAndPrefix(BUCKET, "directory/");
-    while (Iterators.size(blobs.iterateAll()) < 2) {
+    while (Iterators.size(blobs.iterateAll().iterator()) < 2) {
       Thread.sleep(500);
       blobs = storageSnippets.listBlobsWithDirectoryAndPrefix(BUCKET, "directory/");
     }
     Set blobNames = new HashSet<>();
-    Iterator blobIterator = blobs.iterateAll();
+    Iterator blobIterator = blobs.iterateAll().iterator();
     while (blobIterator.hasNext()) {
       blobNames.add(blobIterator.next().getName());
     }
@@ -209,11 +209,11 @@ public void testGetBucketWithMetageneration() {
   @Test
   public void testListBucketsWithSizeAndPrefix() throws InterruptedException {
     Page buckets = storageSnippets.listBucketsWithSizeAndPrefix(BUCKET);
-    while (Iterators.size(buckets.iterateAll()) < 1) {
+    while (Iterators.size(buckets.iterateAll().iterator()) < 1) {
       Thread.sleep(500);
       buckets = storageSnippets.listBucketsWithSizeAndPrefix(BUCKET);
     }
-    Iterator bucketIterator = buckets.iterateAll();
+    Iterator bucketIterator = buckets.iterateAll().iterator();
     while (bucketIterator.hasNext()) {
       assertTrue(bucketIterator.next().getName().startsWith(BUCKET));
     }

From 22862d6832d06ea39633e315f44f33ccea1cccd3 Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Tue, 11 Apr 2017 10:46:34 -0700
Subject: [PATCH 14/15] Revert unnecessary bigquery changes

---
 .../src/main/java/com/google/cloud/bigquery/QueryResult.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java
index a79e321b9cb5..87d42b3fc4fe 100644
--- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java
+++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java
@@ -128,7 +128,8 @@ public long getTotalBytesProcessed() {
 
   /**
    * Returns the total number of rows in the complete query result set, which can be more than the
-   * number of rows in the first page of results. Returns {@code 0} if the query was a dry run.
+   * number of rows in the first page of results returned by {@link #getValues()}. Returns {@code 0}
+   * if the query was a dry run.
    */
   public long getTotalRows() {
     return totalRows;
@@ -167,7 +168,7 @@ public final boolean equals(Object obj) {
     }
     QueryResult response = (QueryResult) obj;
     return Objects.equals(getNextPageToken(), response.getNextPageToken())
-        && Objects.equals(this.getValues(), response.getValues())
+        && Objects.equals(getValues(), response.getValues())
         && Objects.equals(schema, response.schema)
         && totalRows == response.totalRows
         && totalBytesProcessed == response.totalBytesProcessed

From 0a2ba32aea25d1d6b2c6f55e14c959a7c179e8ae Mon Sep 17 00:00:00 2001
From: Michael Bausor 
Date: Tue, 11 Apr 2017 13:03:46 -0700
Subject: [PATCH 15/15] Address PR comments, bump GAX version

---
 .gitignore                                    |  1 +
 google-cloud-examples/.classpath              | 31 -------------------
 .../google/cloud/logging/BaseSystemTest.java  |  2 +-
 pom.xml                                       |  2 +-
 4 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 google-cloud-examples/.classpath

diff --git a/.gitignore b/.gitignore
index 0f243957839d..d8237a83ad44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ nosetests.xml
 .idea
 .settings
 .DS_Store
+.classpath
 
 # Built documentation
 docs/
diff --git a/google-cloud-examples/.classpath b/google-cloud-examples/.classpath
deleted file mode 100644
index b2acffc95125..000000000000
--- a/google-cloud-examples/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-	
-		
-			
-			
-		
-	
-	
-		
-			
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
index 3af0f044dd4f..a5a4789422bb 100644
--- a/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
+++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
@@ -23,9 +23,9 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.api.gax.core.AsyncPage;
+import com.google.api.gax.core.Page;
 import com.google.cloud.MonitoredResource;
 import com.google.cloud.MonitoredResourceDescriptor;
-import com.google.api.gax.core.Page;
 import com.google.cloud.logging.Logging.EntryListOption;
 import com.google.cloud.logging.Logging.SortingField;
 import com.google.cloud.logging.Logging.SortingOrder;
diff --git a/pom.xml b/pom.xml
index 1cfb34f8bee5..8d3aef90077f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
     github
     0.6.1
     1.0.3
-    0.8.1
+    0.9.0
     0.1.5
     0.12.1-alpha-SNAPSHOT
     0.12.1-beta-SNAPSHOT