Skip to content

Commit 4e9f9e3

Browse files
dpebotlesv
authored andcommitted
Auto-update dependencies. (GoogleCloudPlatform#614)
* Auto-update dependencies. * Update to new gax 1. Update for new tax 2. Lots of trivial formatting changes
1 parent 8b7e67e commit 4e9f9e3

File tree

18 files changed

+54
-111
lines changed

18 files changed

+54
-111
lines changed

appengine/endpoints-frameworks-v2/backend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333

34-
<endpoints.framework.version>2.0.5</endpoints.framework.version>
34+
<endpoints.framework.version>2.0.6</endpoints.framework.version>
3535
<endpoints.management.version>1.0.3</endpoints.management.version>
3636

3737
<endpoints.project.id>YOUR_PROJECT_ID</endpoints.project.id>

datastore/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-datastore</artifactId>
40-
<version>0.12.0-beta</version>
40+
<version>0.13.0-beta</version>
4141
</dependency>
4242

4343
<!-- Test dependencies -->

datastore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>com.google.cloud</groupId>
4343
<artifactId>google-cloud-datastore</artifactId>
44-
<version>0.12.0-beta</version>
44+
<version>0.13.0-beta</version>
4545
</dependency>
4646

4747
<!-- Test dependencies -->

flexible/cloudstorage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.cloud</groupId>
5151
<artifactId>google-cloud-storage</artifactId>
52-
<version>0.12.0-beta</version>
52+
<version>0.13.0-beta</version>
5353
</dependency>
5454
<!-- [END dependencies] -->
5555
</dependencies>

flexible/datastore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.cloud</groupId>
5151
<artifactId>google-cloud-datastore</artifactId>
52-
<version>0.12.0-beta</version>
52+
<version>0.13.0-beta</version>
5353
</dependency>
5454
<!-- [END dependencies] -->
5555
</dependencies>

flexible/sparkjava/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ limitations under the License.
6161
<dependency>
6262
<groupId>com.google.cloud</groupId>
6363
<artifactId>google-cloud-datastore</artifactId>
64-
<version>0.12.0-beta</version>
64+
<version>0.13.0-beta</version>
6565
</dependency>
6666
</dependencies>
6767
<build>

language/analysis/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ limitations under the License.
2525
<dependency>
2626
<groupId>com.google.cloud</groupId>
2727
<artifactId>google-cloud-language</artifactId>
28-
<version>0.12.0-beta</version>
28+
<version>0.13.0-beta</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>com.google.guava</groupId>

language/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-language</artifactId>
40-
<version>0.12.0-beta</version>
40+
<version>0.13.0-beta</version>
4141
</dependency>
4242

4343
<!-- Test dependencies -->

logging/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-logging</artifactId>
40-
<version>0.12.0-beta</version>
40+
<version>0.13.0-beta</version>
4141
</dependency>
4242

4343
<!-- Test dependencies -->

monitoring/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-monitoring</artifactId>
40-
<version>0.12.0-alpha</version>
40+
<version>0.13.0-alpha</version>
4141
</dependency>
4242

4343
<!-- Test dependencies -->

monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java

Lines changed: 37 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class Snippets {
5353

5454
/**
5555
* Exercises the methods defined in this class.
56-
*
56+
* <p>
5757
* <p>Assumes that you are authenticated using the Google Cloud SDK (using
5858
* {@code gcloud auth application-default-login}).
5959
*/
@@ -81,8 +81,9 @@ public static void main(String[] args) throws Exception {
8181

8282
/**
8383
* Creates a metric descriptor.
84-
*
84+
* <p>
8585
* See: https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.metricDescriptors/create
86+
*
8687
* @param type The metric type
8788
*/
8889
void createMetricDescriptor(String type) throws IOException {
@@ -112,6 +113,7 @@ void createMetricDescriptor(String type) throws IOException {
112113

113114
/**
114115
* Delete a metric descriptor.
116+
*
115117
* @param name Name of metric descriptor to delete
116118
*/
117119
void deleteMetricDescriptor(String name) throws IOException {
@@ -127,11 +129,10 @@ void deleteMetricDescriptor(String name) throws IOException {
127129
/**
128130
* Demonstrates writing a time series value for the metric type
129131
* 'custom.google.apis.com/my_metric'.
130-
*
132+
* <p>
131133
* This method assumes `my_metric` descriptor has already been created as a
132134
* DOUBLE value_type and GAUGE metric kind. If the metric descriptor
133135
* doesn't exist, it will be auto-created.
134-
*
135136
*/
136137
void writeTimeSeries() throws IOException {
137138
// [START monitoring_write_timeseries]
@@ -203,7 +204,6 @@ void listTimeSeriesHeaders() throws IOException {
203204
String projectId = System.getProperty("projectId");
204205
ProjectName name = ProjectName.create(projectId);
205206

206-
207207
// Restrict time to last 20 minutes
208208
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
209209
TimeInterval interval = TimeInterval.newBuilder()
@@ -217,41 +217,27 @@ void listTimeSeriesHeaders() throws IOException {
217217
.setInterval(interval)
218218
.setView(ListTimeSeriesRequest.TimeSeriesView.HEADERS);
219219

220-
String nextToken = "";
220+
ListTimeSeriesRequest request = requestBuilder.build();
221221

222-
do {
223-
if (nextToken != null) {
224-
requestBuilder.setPageToken(nextToken);
225-
}
226-
ListTimeSeriesRequest request = requestBuilder.build();
222+
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
223+
.listTimeSeries(request);
227224

228-
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
229-
.listTimeSeries(request);
230-
List<TimeSeries> timeseries = response.getPage()
231-
.getResponseObject()
232-
.getTimeSeriesList();
233-
234-
System.out.println("Got timeseries headers: ");
235-
for (TimeSeries ts : timeseries) {
236-
System.out.println(ts);
237-
}
238-
Object nextObjectToken = response.getNextPageToken();
239-
nextToken = (String)nextObjectToken;
240-
} while (nextToken != "");
225+
System.out.println("Got timeseries headers: ");
226+
for (TimeSeries ts : response.iterateAll()) {
227+
System.out.println(ts);
228+
}
241229
// [END monitoring_read_timeseries_fields]
242230
}
243231

244232
/**
245233
* Demonstrates listing time series using a filter.
246-
*
247234
*/
248235
void listTimeSeries(String filter) throws IOException {
249236
// [START monitoring_read_timeseries_simple]
250237
MetricServiceClient metricServiceClient = MetricServiceClient.create();
251238
String projectId = System.getProperty("projectId");
252239
ProjectName name = ProjectName.create(projectId);
253240

254-
255241
// Restrict time to last 20 minutes
256242
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
257243
TimeInterval interval = TimeInterval.newBuilder()
@@ -264,41 +250,27 @@ void listTimeSeries(String filter) throws IOException {
264250
.setFilter(filter)
265251
.setInterval(interval);
266252

267-
String nextToken = "";
268-
269-
do {
270-
if (nextToken != null) {
271-
requestBuilder.setPageToken(nextToken);
272-
}
273-
ListTimeSeriesRequest request = requestBuilder.build();
253+
ListTimeSeriesRequest request = requestBuilder.build();
274254

275-
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
276-
.listTimeSeries(request);
277-
List<TimeSeries> timeseries = response.getPage()
278-
.getResponseObject()
279-
.getTimeSeriesList();
255+
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
256+
.listTimeSeries(request);
280257

281-
System.out.println("Got timeseries: ");
282-
for (TimeSeries ts : timeseries) {
283-
System.out.println(ts);
284-
}
285-
Object nextObjectToken = response.getNextPageToken();
286-
nextToken = (String)nextObjectToken;
287-
} while (nextToken != "");
258+
System.out.println("Got timeseries: ");
259+
for (TimeSeries ts : response.iterateAll()) {
260+
System.out.println(ts);
261+
}
288262
// [END monitoring_read_timeseries_simple]
289263
}
290264

291265
/**
292266
* Demonstrates listing time series and aggregating them.
293-
*
294267
*/
295268
void listTimeSeriesAggregrate() throws IOException {
296269
// [START monitoring_read_timeseries_align]
297270
MetricServiceClient metricServiceClient = MetricServiceClient.create();
298271
String projectId = System.getProperty("projectId");
299272
ProjectName name = ProjectName.create(projectId);
300273

301-
302274
// Restrict time to last 20 minutes
303275
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
304276
TimeInterval interval = TimeInterval.newBuilder()
@@ -317,40 +289,27 @@ void listTimeSeriesAggregrate() throws IOException {
317289
.setInterval(interval)
318290
.setAggregation(aggregation);
319291

320-
String nextToken = "";
321-
do {
322-
if (nextToken != null) {
323-
requestBuilder.setPageToken(nextToken);
324-
}
325-
ListTimeSeriesRequest request = requestBuilder.build();
292+
ListTimeSeriesRequest request = requestBuilder.build();
326293

327-
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
328-
.listTimeSeries(request);
329-
List<TimeSeries> timeseries = response.getPage()
330-
.getResponseObject()
331-
.getTimeSeriesList();
294+
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
295+
.listTimeSeries(request);
332296

333-
System.out.println("Got timeseries: ");
334-
for (TimeSeries ts : timeseries) {
335-
System.out.println(ts);
336-
}
337-
Object nextObjectToken = response.getNextPageToken();
338-
nextToken = (String)nextObjectToken;
339-
} while (nextToken != "");
297+
System.out.println("Got timeseries: ");
298+
for (TimeSeries ts : response.iterateAll()) {
299+
System.out.println(ts);
300+
}
340301
// [END monitoring_read_timeseries_align]
341302
}
342303

343304
/**
344305
* Demonstrates listing time series and aggregating and reducing them.
345-
*
346306
*/
347307
void listTimeSeriesReduce() throws IOException {
348308
// [START monitoring_read_timeseries_reduce]
349309
MetricServiceClient metricServiceClient = MetricServiceClient.create();
350310
String projectId = System.getProperty("projectId");
351311
ProjectName name = ProjectName.create(projectId);
352312

353-
354313
// Restrict time to last 20 minutes
355314
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
356315
TimeInterval interval = TimeInterval.newBuilder()
@@ -370,27 +329,15 @@ void listTimeSeriesReduce() throws IOException {
370329
.setInterval(interval)
371330
.setAggregation(aggregation);
372331

373-
String nextToken = "";
374-
375-
do {
376-
if (nextToken != null) {
377-
requestBuilder.setPageToken(nextToken);
378-
}
379-
ListTimeSeriesRequest request = requestBuilder.build();
332+
ListTimeSeriesRequest request = requestBuilder.build();
380333

381-
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
382-
.listTimeSeries(request);
383-
List<TimeSeries> timeseries = response.getPage()
384-
.getResponseObject()
385-
.getTimeSeriesList();
334+
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
335+
.listTimeSeries(request);
386336

387-
System.out.println("Got timeseries: ");
388-
for (TimeSeries ts : timeseries) {
389-
System.out.println(ts);
390-
}
391-
Object nextObjectToken = response.getNextPageToken();
392-
nextToken = (String)nextObjectToken;
393-
} while (nextToken != "");
337+
System.out.println("Got timeseries: ");
338+
for (TimeSeries ts : response.iterateAll()) {
339+
System.out.println(ts);
340+
}
394341
// [END monitoring_read_timeseries_reduce]
395342
}
396343

@@ -414,9 +361,7 @@ void listMetricDescriptors() throws IOException {
414361

415362
System.out.println("Listing descriptors: ");
416363

417-
List<MetricDescriptor> descriptors = response.getPage()
418-
.getResponseObject().getMetricDescriptorsList();
419-
for (MetricDescriptor d : descriptors) {
364+
for (MetricDescriptor d : response.iterateAll()) {
420365
System.out.println(d.getName() + " " + d.getDisplayName());
421366
}
422367
// [END monitoring_list_descriptors]
@@ -443,18 +388,16 @@ void listMonitoredResources() throws IOException {
443388
PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse response = client
444389
.listMonitoredResourceDescriptors(request);
445390

446-
List<MonitoredResourceDescriptor> descriptors = response.getPage()
447-
.getResponseObject().getResourceDescriptorsList();
448-
449-
for (MonitoredResourceDescriptor d : descriptors) {
391+
for (MonitoredResourceDescriptor d : response.iterateAll()) {
450392
System.out.println(d.getType());
451393
}
452394
// [END monitoring_list_resources]
453395
}
454396

455397
/**
456398
* Gets full information for a monitored resource.
457-
* @param The resource type
399+
*
400+
* @param type The resource type
458401
*/
459402
void describeMonitoredResources(String type) throws IOException {
460403
// [START monitoring_get_descriptor]

pubsub/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<maven.compiler.target>1.8</maven.compiler.target>
3232
<maven.compiler.source>1.8</maven.compiler.source>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34-
<pubsub.version>0.12.0-alpha</pubsub.version>
34+
<pubsub.version>0.13.0-alpha</pubsub.version>
3535
</properties>
3636

3737
<dependencies>

spanner/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ limitations under the License.
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-spanner</artifactId>
55-
<version>0.12.0-beta</version>
55+
<version>0.13.0-beta</version>
5656
<exclusions>
5757
<exclusion> <!-- exclude an old version of Guava -->
5858
<groupId>com.google.guava</groupId>

speech/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>com.google.truth</groupId>
5454
<artifactId>truth</artifactId>
55-
<version>0.31</version>
55+
<version>0.32</version>
5656
<scope>test</scope>
5757
</dependency>
5858
</dependencies>

storage/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-storage</artifactId>
40-
<version>0.12.0-beta</version>
40+
<version>0.13.0-beta</version>
4141
</dependency>
4242

4343
<!-- Test dependencies -->

translate/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>google-cloud-translate</artifactId>
40-
<version>0.12.0-beta</version>
40+
<version>0.13.0-beta</version>
4141
</dependency>
4242

4343
<!-- Test dependencies -->

0 commit comments

Comments
 (0)