com.google.guava
diff --git a/language/cloud-client/pom.xml b/language/cloud-client/pom.xml
index 9c4e364af41..f1dfdd900bf 100644
--- a/language/cloud-client/pom.xml
+++ b/language/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-language
- 0.12.0-beta
+ 0.13.0-beta
diff --git a/logging/cloud-client/pom.xml b/logging/cloud-client/pom.xml
index 3e0ed57df54..dc98e9059c6 100644
--- a/logging/cloud-client/pom.xml
+++ b/logging/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-logging
- 0.12.0-beta
+ 0.13.0-beta
diff --git a/monitoring/cloud-client/pom.xml b/monitoring/cloud-client/pom.xml
index d0bd0119b68..73133db2c1a 100644
--- a/monitoring/cloud-client/pom.xml
+++ b/monitoring/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-monitoring
- 0.12.0-alpha
+ 0.13.0-alpha
diff --git a/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java b/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java
index 07df8fe7391..66fcb481587 100644
--- a/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java
+++ b/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java
@@ -53,7 +53,7 @@ public class Snippets {
/**
* Exercises the methods defined in this class.
- *
+ *
*
Assumes that you are authenticated using the Google Cloud SDK (using
* {@code gcloud auth application-default-login}).
*/
@@ -81,8 +81,9 @@ public static void main(String[] args) throws Exception {
/**
* Creates a metric descriptor.
- *
+ *
* See: https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.metricDescriptors/create
+ *
* @param type The metric type
*/
void createMetricDescriptor(String type) throws IOException {
@@ -112,6 +113,7 @@ void createMetricDescriptor(String type) throws IOException {
/**
* Delete a metric descriptor.
+ *
* @param name Name of metric descriptor to delete
*/
void deleteMetricDescriptor(String name) throws IOException {
@@ -127,11 +129,10 @@ void deleteMetricDescriptor(String name) throws IOException {
/**
* Demonstrates writing a time series value for the metric type
* 'custom.google.apis.com/my_metric'.
- *
+ *
* This method assumes `my_metric` descriptor has already been created as a
* DOUBLE value_type and GAUGE metric kind. If the metric descriptor
* doesn't exist, it will be auto-created.
- *
*/
void writeTimeSeries() throws IOException {
// [START monitoring_write_timeseries]
@@ -203,7 +204,6 @@ void listTimeSeriesHeaders() throws IOException {
String projectId = System.getProperty("projectId");
ProjectName name = ProjectName.create(projectId);
-
// Restrict time to last 20 minutes
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
TimeInterval interval = TimeInterval.newBuilder()
@@ -217,33 +217,20 @@ void listTimeSeriesHeaders() throws IOException {
.setInterval(interval)
.setView(ListTimeSeriesRequest.TimeSeriesView.HEADERS);
- String nextToken = "";
+ ListTimeSeriesRequest request = requestBuilder.build();
- do {
- if (nextToken != null) {
- requestBuilder.setPageToken(nextToken);
- }
- ListTimeSeriesRequest request = requestBuilder.build();
+ PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
+ .listTimeSeries(request);
- PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
- .listTimeSeries(request);
- List timeseries = response.getPage()
- .getResponseObject()
- .getTimeSeriesList();
-
- System.out.println("Got timeseries headers: ");
- for (TimeSeries ts : timeseries) {
- System.out.println(ts);
- }
- Object nextObjectToken = response.getNextPageToken();
- nextToken = (String)nextObjectToken;
- } while (nextToken != "");
+ System.out.println("Got timeseries headers: ");
+ for (TimeSeries ts : response.iterateAll()) {
+ System.out.println(ts);
+ }
// [END monitoring_read_timeseries_fields]
}
/**
* Demonstrates listing time series using a filter.
- *
*/
void listTimeSeries(String filter) throws IOException {
// [START monitoring_read_timeseries_simple]
@@ -251,7 +238,6 @@ void listTimeSeries(String filter) throws IOException {
String projectId = System.getProperty("projectId");
ProjectName name = ProjectName.create(projectId);
-
// Restrict time to last 20 minutes
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
TimeInterval interval = TimeInterval.newBuilder()
@@ -264,33 +250,20 @@ void listTimeSeries(String filter) throws IOException {
.setFilter(filter)
.setInterval(interval);
- String nextToken = "";
-
- do {
- if (nextToken != null) {
- requestBuilder.setPageToken(nextToken);
- }
- ListTimeSeriesRequest request = requestBuilder.build();
+ ListTimeSeriesRequest request = requestBuilder.build();
- PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
- .listTimeSeries(request);
- List timeseries = response.getPage()
- .getResponseObject()
- .getTimeSeriesList();
+ PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
+ .listTimeSeries(request);
- System.out.println("Got timeseries: ");
- for (TimeSeries ts : timeseries) {
- System.out.println(ts);
- }
- Object nextObjectToken = response.getNextPageToken();
- nextToken = (String)nextObjectToken;
- } while (nextToken != "");
+ System.out.println("Got timeseries: ");
+ for (TimeSeries ts : response.iterateAll()) {
+ System.out.println(ts);
+ }
// [END monitoring_read_timeseries_simple]
}
/**
* Demonstrates listing time series and aggregating them.
- *
*/
void listTimeSeriesAggregrate() throws IOException {
// [START monitoring_read_timeseries_align]
@@ -298,7 +271,6 @@ void listTimeSeriesAggregrate() throws IOException {
String projectId = System.getProperty("projectId");
ProjectName name = ProjectName.create(projectId);
-
// Restrict time to last 20 minutes
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
TimeInterval interval = TimeInterval.newBuilder()
@@ -317,32 +289,20 @@ void listTimeSeriesAggregrate() throws IOException {
.setInterval(interval)
.setAggregation(aggregation);
- String nextToken = "";
- do {
- if (nextToken != null) {
- requestBuilder.setPageToken(nextToken);
- }
- ListTimeSeriesRequest request = requestBuilder.build();
+ ListTimeSeriesRequest request = requestBuilder.build();
- PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
- .listTimeSeries(request);
- List timeseries = response.getPage()
- .getResponseObject()
- .getTimeSeriesList();
+ PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
+ .listTimeSeries(request);
- System.out.println("Got timeseries: ");
- for (TimeSeries ts : timeseries) {
- System.out.println(ts);
- }
- Object nextObjectToken = response.getNextPageToken();
- nextToken = (String)nextObjectToken;
- } while (nextToken != "");
+ System.out.println("Got timeseries: ");
+ for (TimeSeries ts : response.iterateAll()) {
+ System.out.println(ts);
+ }
// [END monitoring_read_timeseries_align]
}
/**
* Demonstrates listing time series and aggregating and reducing them.
- *
*/
void listTimeSeriesReduce() throws IOException {
// [START monitoring_read_timeseries_reduce]
@@ -350,7 +310,6 @@ void listTimeSeriesReduce() throws IOException {
String projectId = System.getProperty("projectId");
ProjectName name = ProjectName.create(projectId);
-
// Restrict time to last 20 minutes
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
TimeInterval interval = TimeInterval.newBuilder()
@@ -370,27 +329,15 @@ void listTimeSeriesReduce() throws IOException {
.setInterval(interval)
.setAggregation(aggregation);
- String nextToken = "";
-
- do {
- if (nextToken != null) {
- requestBuilder.setPageToken(nextToken);
- }
- ListTimeSeriesRequest request = requestBuilder.build();
+ ListTimeSeriesRequest request = requestBuilder.build();
- PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
- .listTimeSeries(request);
- List timeseries = response.getPage()
- .getResponseObject()
- .getTimeSeriesList();
+ PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
+ .listTimeSeries(request);
- System.out.println("Got timeseries: ");
- for (TimeSeries ts : timeseries) {
- System.out.println(ts);
- }
- Object nextObjectToken = response.getNextPageToken();
- nextToken = (String)nextObjectToken;
- } while (nextToken != "");
+ System.out.println("Got timeseries: ");
+ for (TimeSeries ts : response.iterateAll()) {
+ System.out.println(ts);
+ }
// [END monitoring_read_timeseries_reduce]
}
@@ -414,9 +361,7 @@ void listMetricDescriptors() throws IOException {
System.out.println("Listing descriptors: ");
- List descriptors = response.getPage()
- .getResponseObject().getMetricDescriptorsList();
- for (MetricDescriptor d : descriptors) {
+ for (MetricDescriptor d : response.iterateAll()) {
System.out.println(d.getName() + " " + d.getDisplayName());
}
// [END monitoring_list_descriptors]
@@ -443,10 +388,7 @@ void listMonitoredResources() throws IOException {
PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse response = client
.listMonitoredResourceDescriptors(request);
- List descriptors = response.getPage()
- .getResponseObject().getResourceDescriptorsList();
-
- for (MonitoredResourceDescriptor d : descriptors) {
+ for (MonitoredResourceDescriptor d : response.iterateAll()) {
System.out.println(d.getType());
}
// [END monitoring_list_resources]
@@ -454,7 +396,8 @@ void listMonitoredResources() throws IOException {
/**
* Gets full information for a monitored resource.
- * @param The resource type
+ *
+ * @param type The resource type
*/
void describeMonitoredResources(String type) throws IOException {
// [START monitoring_get_descriptor]
diff --git a/pubsub/cloud-client/pom.xml b/pubsub/cloud-client/pom.xml
index 0088599b1f2..68a50196481 100644
--- a/pubsub/cloud-client/pom.xml
+++ b/pubsub/cloud-client/pom.xml
@@ -31,7 +31,7 @@
1.8
1.8
UTF-8
- 0.12.0-alpha
+ 0.13.0-alpha