diff --git a/appengine-java8/analytics/pom.xml b/appengine-java8/analytics/pom.xml
index c2172637869..1edf5311aea 100644
--- a/appengine-java8/analytics/pom.xml
+++ b/appengine-java8/analytics/pom.xml
@@ -85,7 +85,7 @@
org.mockito
mockito-core
- 2.11.0
+ 2.12.0
test
diff --git a/appengine-java8/bigtable/pom.xml b/appengine-java8/bigtable/pom.xml
index fb91a41bd44..5d41c9b42f2 100644
--- a/appengine-java8/bigtable/pom.xml
+++ b/appengine-java8/bigtable/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
- 1.3.1
+ 1.3.2
UTF-8
UTF-8
1.8
diff --git a/appengine-java8/endpoints-v2-backend/pom.xml b/appengine-java8/endpoints-v2-backend/pom.xml
index 1a2bdf9bf4d..09e2cb2deee 100644
--- a/appengine-java8/endpoints-v2-backend/pom.xml
+++ b/appengine-java8/endpoints-v2-backend/pom.xml
@@ -37,7 +37,7 @@
YOUR_PROJECT_ID
1.8
1.8
- 1.3.1
+ 1.3.2
@@ -50,7 +50,7 @@
com.google.endpoints
endpoints-management-control-appengine-all
- 1.0.5
+ 1.0.6
com.google.appengine
diff --git a/appengine-java8/endpoints-v2-guice/pom.xml b/appengine-java8/endpoints-v2-guice/pom.xml
index 199d1512106..f14b3363af5 100644
--- a/appengine-java8/endpoints-v2-guice/pom.xml
+++ b/appengine-java8/endpoints-v2-guice/pom.xml
@@ -37,7 +37,7 @@
YOUR_PROJECT_ID
1.8
1.8
- 1.3.1
+ 1.3.2
@@ -57,7 +57,7 @@
com.google.endpoints
endpoints-management-control-appengine-all
- 1.0.5
+ 1.0.6
com.google.appengine
diff --git a/appengine-java8/firebase-tictactoe/pom.xml b/appengine-java8/firebase-tictactoe/pom.xml
index 2cc512e36eb..342f5ef7965 100644
--- a/appengine-java8/firebase-tictactoe/pom.xml
+++ b/appengine-java8/firebase-tictactoe/pom.xml
@@ -36,7 +36,7 @@
4.12
1.10.19
0.36
- 1.3.1
+ 1.3.2
diff --git a/appengine-java8/guestbook-cloud-datastore/pom.xml b/appengine-java8/guestbook-cloud-datastore/pom.xml
index db44fdd2bee..89f2554d1b4 100644
--- a/appengine-java8/guestbook-cloud-datastore/pom.xml
+++ b/appengine-java8/guestbook-cloud-datastore/pom.xml
@@ -59,7 +59,7 @@
com.google.cloud
google-cloud
- 0.26.0-alpha
+ 0.29.0-alpha
diff --git a/appengine-java8/pubsub/pom.xml b/appengine-java8/pubsub/pom.xml
index a5fa0c027a1..06c24e3ca4a 100644
--- a/appengine-java8/pubsub/pom.xml
+++ b/appengine-java8/pubsub/pom.xml
@@ -32,7 +32,7 @@
1.8
1.8
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
@@ -49,12 +49,12 @@
com.google.cloud
google-cloud-pubsub
- 0.26.0-beta
+ 0.29.0-beta
com.google.cloud
google-cloud-datastore
- 1.8.0
+ 1.11.0
diff --git a/appengine-java8/spanner/pom.xml b/appengine-java8/spanner/pom.xml
index 72d303dde9f..308522c28cc 100644
--- a/appengine-java8/spanner/pom.xml
+++ b/appengine-java8/spanner/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-spanner
- 0.26.0-beta
+ 0.29.0-beta
javax.servlet
diff --git a/appengine-java8/taskqueues-deferred/pom.xml b/appengine-java8/taskqueues-deferred/pom.xml
index bcb47e37962..516d51326c5 100644
--- a/appengine-java8/taskqueues-deferred/pom.xml
+++ b/appengine-java8/taskqueues-deferred/pom.xml
@@ -65,7 +65,7 @@
org.mockito
mockito-core
- 2.11.0
+ 2.12.0
com.google.appengine
diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml
index bd4cb46d1ba..85d2e7b1e97 100644
--- a/appengine/endpoints-frameworks-v2/backend/pom.xml
+++ b/appengine/endpoints-frameworks-v2/backend/pom.xml
@@ -36,7 +36,7 @@
YOUR_PROJECT_ID
1.7
1.7
- 1.3.1
+ 1.3.2
@@ -50,12 +50,12 @@
com.google.endpoints
endpoints-management-control-appengine
- 1.0.5
+ 1.0.6
com.google.endpoints
endpoints-framework-auth
- 1.0.5
+ 1.0.6
diff --git a/appengine/endpoints-frameworks-v2/guice-example/pom.xml b/appengine/endpoints-frameworks-v2/guice-example/pom.xml
index 95f9de69b83..230887e4e09 100644
--- a/appengine/endpoints-frameworks-v2/guice-example/pom.xml
+++ b/appengine/endpoints-frameworks-v2/guice-example/pom.xml
@@ -36,7 +36,7 @@
YOUR_PROJECT_ID
1.7
1.7
- 1.3.1
+ 1.3.2
@@ -54,7 +54,7 @@
com.google.endpoints
endpoints-management-control-appengine-all
- 1.0.5
+ 1.0.6
com.google.appengine
diff --git a/appengine/firebase-tictactoe/pom.xml b/appengine/firebase-tictactoe/pom.xml
index 36093112f3e..743a055aa3a 100644
--- a/appengine/firebase-tictactoe/pom.xml
+++ b/appengine/firebase-tictactoe/pom.xml
@@ -55,7 +55,7 @@
org.mockito
mockito-core
- 2.11.0
+ 2.12.0
com.google.appengine
diff --git a/appengine/pom.xml b/appengine/pom.xml
index b7078227ee3..68f64300a6a 100644
--- a/appengine/pom.xml
+++ b/appengine/pom.xml
@@ -114,7 +114,7 @@
org.mockito
mockito-core
- 2.11.0
+ 2.12.0
test
diff --git a/bigquery/cloud-client/pom.xml b/bigquery/cloud-client/pom.xml
index 6c024e1bc95..4923cf64873 100644
--- a/bigquery/cloud-client/pom.xml
+++ b/bigquery/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-bigquery
- 0.26.0-beta
+ 0.29.0-beta
commons-cli
diff --git a/compute/cmdline/pom.xml b/compute/cmdline/pom.xml
index 588ea15e313..6022736a8e0 100644
--- a/compute/cmdline/pom.xml
+++ b/compute/cmdline/pom.xml
@@ -84,7 +84,7 @@ limitations under the License.
- v1-rev160-1.23.0
+ v1-rev161-1.23.0
UTF-8
diff --git a/datastore/cloud-client/pom.xml b/datastore/cloud-client/pom.xml
index 5fc827d5a23..95597ff783b 100644
--- a/datastore/cloud-client/pom.xml
+++ b/datastore/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-datastore
- 1.8.0
+ 1.11.0
diff --git a/datastore/pom.xml b/datastore/pom.xml
index dacb284585c..63eeeae6cf8 100644
--- a/datastore/pom.xml
+++ b/datastore/pom.xml
@@ -41,7 +41,7 @@
com.google.cloud
google-cloud-datastore
- 1.8.0
+ 1.11.0
diff --git a/dlp/pom.xml b/dlp/pom.xml
index 5d9f75c3cd0..92bf99b53ba 100644
--- a/dlp/pom.xml
+++ b/dlp/pom.xml
@@ -42,7 +42,7 @@
com.google.cloud
google-cloud-dlp
- 0.26.0-alpha
+ 0.29.0-beta
diff --git a/dlp/src/main/java/com/example/dlp/Inspect.java b/dlp/src/main/java/com/example/dlp/Inspect.java
index b39be30adc7..28c958d0fcb 100644
--- a/dlp/src/main/java/com/example/dlp/Inspect.java
+++ b/dlp/src/main/java/com/example/dlp/Inspect.java
@@ -16,7 +16,7 @@
package com.example.dlp;
-import com.google.api.gax.rpc.OperationFuture;
+import com.google.api.gax.longrunning.OperationFuture;
import com.google.cloud.ServiceOptions;
import com.google.cloud.dlp.v2beta1.DlpServiceClient;
import com.google.longrunning.Operation;
@@ -235,7 +235,7 @@ private static void inspectGcsFile(
OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
// asynchronously submit an inspect operation
- OperationFuture responseFuture =
+ OperationFuture responseFuture =
dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
// ...
@@ -309,7 +309,7 @@ private static void inspectDatastore(
OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
// asynchronously submit an inspect operation
- OperationFuture responseFuture =
+ OperationFuture responseFuture =
dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
// ...
@@ -387,7 +387,7 @@ private static void inspectBigquery(
OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
// asynchronously submit an inspect operation
- OperationFuture responseFuture =
+ OperationFuture responseFuture =
dlpServiceClient.createInspectOperationAsync(
inspectConfig, storageConfig, outputConfig);
diff --git a/dlp/src/main/java/com/example/dlp/RiskAnalysis.java b/dlp/src/main/java/com/example/dlp/RiskAnalysis.java
index 5fc95bdec86..89cb840f2d0 100644
--- a/dlp/src/main/java/com/example/dlp/RiskAnalysis.java
+++ b/dlp/src/main/java/com/example/dlp/RiskAnalysis.java
@@ -16,7 +16,7 @@
package com.example.dlp;
-import com.google.api.gax.rpc.OperationFuture;
+import com.google.api.gax.longrunning.OperationFuture;
import com.google.cloud.ServiceOptions;
import com.google.cloud.dlp.v2beta1.DlpServiceClient;
import com.google.longrunning.Operation;
@@ -102,7 +102,7 @@ private static void calculateNumericalStats(
.build();
// asynchronously submit a risk analysis operation
- OperationFuture
+ OperationFuture
responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
// ...
@@ -180,7 +180,7 @@ private static void calculateCategoricalStats(
.build();
// asynchronously submit a risk analysis operation
- OperationFuture
+ OperationFuture
responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
// ...
@@ -259,7 +259,7 @@ private static void calculateKAnonymity(
.build();
// asynchronously submit a risk analysis operation
- OperationFuture
+ OperationFuture
responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
// ...
@@ -352,7 +352,7 @@ private static void calculateLDiversity(
.build();
// asynchronously submit a risk analysis operation
- OperationFuture
+ OperationFuture
responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
// ...
diff --git a/errorreporting/pom.xml b/errorreporting/pom.xml
index ebddebee2aa..01740a5306d 100644
--- a/errorreporting/pom.xml
+++ b/errorreporting/pom.xml
@@ -36,7 +36,7 @@ limitations under the License.
com.google.cloud
google-cloud-errorreporting
- 0.26.0-alpha
+ 0.29.0-beta
diff --git a/firestore/pom.xml b/firestore/pom.xml
index 0c732fc5e4a..aeabf55f4ff 100644
--- a/firestore/pom.xml
+++ b/firestore/pom.xml
@@ -43,7 +43,7 @@
com.google.cloud
google-cloud-firestore
- 0.26.0-beta
+ 0.29.0-beta
diff --git a/flexible/analytics/pom.xml b/flexible/analytics/pom.xml
index 778ec3807e4..9836503b19f 100644
--- a/flexible/analytics/pom.xml
+++ b/flexible/analytics/pom.xml
@@ -28,7 +28,7 @@
- 1.3.1
+ 1.3.2
9.4.4.v20170414
false
diff --git a/flexible/async-rest/pom.xml b/flexible/async-rest/pom.xml
index 9ca1c73936b..661d9600271 100644
--- a/flexible/async-rest/pom.xml
+++ b/flexible/async-rest/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
1.8
diff --git a/flexible/cloudstorage/pom.xml b/flexible/cloudstorage/pom.xml
index c669f2c4762..af6fcc9748d 100644
--- a/flexible/cloudstorage/pom.xml
+++ b/flexible/cloudstorage/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
@@ -49,7 +49,7 @@
com.google.cloud
google-cloud-storage
- 1.8.0
+ 1.11.0
diff --git a/flexible/cron/pom.xml b/flexible/cron/pom.xml
index a3735b4e763..92dc43da5cb 100644
--- a/flexible/cron/pom.xml
+++ b/flexible/cron/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
diff --git a/flexible/datastore/pom.xml b/flexible/datastore/pom.xml
index 2838a4721fe..6502ee2c1a1 100644
--- a/flexible/datastore/pom.xml
+++ b/flexible/datastore/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
@@ -49,7 +49,7 @@
com.google.cloud
google-cloud-datastore
- 1.8.0
+ 1.11.0
diff --git a/flexible/disk/pom.xml b/flexible/disk/pom.xml
index dd6db190357..59f50df8821 100644
--- a/flexible/disk/pom.xml
+++ b/flexible/disk/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
diff --git a/flexible/errorreporting/pom.xml b/flexible/errorreporting/pom.xml
index e5cbda31226..f06d5179039 100644
--- a/flexible/errorreporting/pom.xml
+++ b/flexible/errorreporting/pom.xml
@@ -29,7 +29,7 @@
- 1.3.1
+ 1.3.2
1.8
1.8
false
@@ -47,7 +47,7 @@
com.google.cloud
google-cloud-errorreporting
- 0.26.0-alpha
+ 0.29.0-beta
diff --git a/flexible/extending-runtime/pom.xml b/flexible/extending-runtime/pom.xml
index e98937672c2..b6259c7c636 100644
--- a/flexible/extending-runtime/pom.xml
+++ b/flexible/extending-runtime/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
diff --git a/flexible/helloworld/pom.xml b/flexible/helloworld/pom.xml
index 992f3fc8291..0e2edccba9f 100644
--- a/flexible/helloworld/pom.xml
+++ b/flexible/helloworld/pom.xml
@@ -34,7 +34,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
diff --git a/flexible/mailgun/pom.xml b/flexible/mailgun/pom.xml
index 6e9726d3662..7b774b7c31f 100644
--- a/flexible/mailgun/pom.xml
+++ b/flexible/mailgun/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
diff --git a/flexible/mailjet/pom.xml b/flexible/mailjet/pom.xml
index 03f51b73a22..84e13b262a7 100644
--- a/flexible/mailjet/pom.xml
+++ b/flexible/mailjet/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
4.1.1
diff --git a/flexible/memcache/pom.xml b/flexible/memcache/pom.xml
index 11d4f837a95..761237d46ab 100644
--- a/flexible/memcache/pom.xml
+++ b/flexible/memcache/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
diff --git a/flexible/pubsub/pom.xml b/flexible/pubsub/pom.xml
index ee83b526b7f..d5c84175eab 100644
--- a/flexible/pubsub/pom.xml
+++ b/flexible/pubsub/pom.xml
@@ -34,7 +34,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
@@ -63,12 +63,12 @@
com.google.cloud
google-cloud-pubsub
- 0.26.0-beta
+ 0.29.0-beta
com.google.cloud
google-cloud-datastore
- 1.8.0
+ 1.11.0
diff --git a/flexible/sendgrid/pom.xml b/flexible/sendgrid/pom.xml
index 2acc328df62..fd2936cffa3 100644
--- a/flexible/sendgrid/pom.xml
+++ b/flexible/sendgrid/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
diff --git a/flexible/sparkjava/pom.xml b/flexible/sparkjava/pom.xml
index dfa3728403d..18f38eee114 100644
--- a/flexible/sparkjava/pom.xml
+++ b/flexible/sparkjava/pom.xml
@@ -33,7 +33,7 @@ limitations under the License.
1.8
1.8
- 1.3.1
+ 1.3.2
${project.build.directory}/spark-1.0-jar-with-dependencies.jar
@@ -41,7 +41,7 @@ limitations under the License.
com.sparkjava
spark-core
- 2.7.0
+ 2.7.1
org.slf4j
@@ -61,7 +61,7 @@ limitations under the License.
com.google.cloud
google-cloud-datastore
- 1.8.0
+ 1.11.0
diff --git a/flexible/static-files/pom.xml b/flexible/static-files/pom.xml
index b6eae603b0c..6f9a1ad0104 100644
--- a/flexible/static-files/pom.xml
+++ b/flexible/static-files/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
diff --git a/flexible/twilio/pom.xml b/flexible/twilio/pom.xml
index 79103067dda..e00375929ce 100644
--- a/flexible/twilio/pom.xml
+++ b/flexible/twilio/pom.xml
@@ -33,7 +33,7 @@
false
- 1.3.1
+ 1.3.2
9.4.4.v20170414
diff --git a/kms/pom.xml b/kms/pom.xml
index 80005cb3929..53ba8dfc9c2 100644
--- a/kms/pom.xml
+++ b/kms/pom.xml
@@ -16,7 +16,7 @@
com.google.apis
google-api-services-cloudkms
- v1-rev26-1.23.0
+ v1-rev27-1.23.0
com.google.guava
diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml
index 7f011b43b7a..3fb783b93a5 100644
--- a/language/analysis/pom.xml
+++ b/language/analysis/pom.xml
@@ -32,7 +32,7 @@ limitations under the License.
com.google.cloud
google-cloud-language
- 0.27.0-beta
+ 1.11.0
com.google.guava
diff --git a/language/cloud-client/pom.xml b/language/cloud-client/pom.xml
index 4bea420fed7..d71199673de 100644
--- a/language/cloud-client/pom.xml
+++ b/language/cloud-client/pom.xml
@@ -38,7 +38,7 @@
com.google.cloud
google-cloud-language
- 0.26.0-beta
+ 1.11.0
com.google.guava
diff --git a/logging/cloud-client/pom.xml b/logging/cloud-client/pom.xml
index bba3cac9b54..1333dcd8f88 100644
--- a/logging/cloud-client/pom.xml
+++ b/logging/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-logging
- 1.8.0
+ 1.11.0
diff --git a/monitoring/cloud-client/pom.xml b/monitoring/cloud-client/pom.xml
index c380c8e03a3..c81fbf39b4f 100644
--- a/monitoring/cloud-client/pom.xml
+++ b/monitoring/cloud-client/pom.xml
@@ -54,7 +54,7 @@
com.google.cloud
google-cloud-monitoring
- 0.26.0-alpha
+ 0.29.0-beta
com.google.guava
diff --git a/pom.xml b/pom.xml
index a5f6da56c43..8957fedce88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
org.mockito
mockito-core
- 2.11.0
+ 2.12.0
test
diff --git a/pubsub/cloud-client/pom.xml b/pubsub/cloud-client/pom.xml
index 5a2dc93cbd1..74fe41bd632 100644
--- a/pubsub/cloud-client/pom.xml
+++ b/pubsub/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-pubsub
- 0.26.0-beta
+ 0.29.0-beta
diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml
index 9a7bc82d9c8..14d72459f80 100644
--- a/spanner/cloud-client/pom.xml
+++ b/spanner/cloud-client/pom.xml
@@ -52,7 +52,7 @@ limitations under the License.
com.google.cloud
google-cloud-spanner
- 0.26.0-beta
+ 0.29.0-beta
com.google.guava
diff --git a/speech/cloud-client/pom.xml b/speech/cloud-client/pom.xml
index db3f4605979..6cfc13ca9db 100644
--- a/speech/cloud-client/pom.xml
+++ b/speech/cloud-client/pom.xml
@@ -38,7 +38,7 @@
com.google.cloud
google-cloud-speech
- 0.26.0-alpha
+ 0.29.0-alpha
diff --git a/speech/cloud-client/src/main/java/com/example/speech/Recognize.java b/speech/cloud-client/src/main/java/com/example/speech/Recognize.java
index ef9e5b483a8..27ef28dacb5 100644
--- a/speech/cloud-client/src/main/java/com/example/speech/Recognize.java
+++ b/speech/cloud-client/src/main/java/com/example/speech/Recognize.java
@@ -18,7 +18,7 @@
import com.google.api.gax.rpc.ApiStreamObserver;
import com.google.api.gax.rpc.BidiStreamingCallable;
-import com.google.api.gax.rpc.OperationFuture;
+import com.google.api.gax.longrunning.OperationFuture;
import com.google.cloud.speech.v1.LongRunningRecognizeMetadata;
import com.google.cloud.speech.v1.LongRunningRecognizeResponse;
import com.google.cloud.speech.v1.RecognitionAudio;
@@ -34,7 +34,6 @@
import com.google.cloud.speech.v1.StreamingRecognizeResponse;
import com.google.cloud.speech.v1.WordInfo;
import com.google.common.util.concurrent.SettableFuture;
-import com.google.longrunning.Operation;
import com.google.protobuf.ByteString;
import java.io.IOException;
import java.nio.file.Files;
@@ -221,8 +220,7 @@ public static void asyncRecognizeFile(String fileName) throws Exception, IOExcep
.build();
// Use non-blocking call for getting file transcription
- OperationFuture response =
+ OperationFuture response =
speech.longRunningRecognizeAsync(config, audio);
while (!response.isDone()) {
@@ -263,8 +261,7 @@ public static void asyncRecognizeWords(String gcsUri) throws Exception, IOExcept
.build();
// Use non-blocking call for getting file transcription
- OperationFuture response =
+ OperationFuture response =
speech.longRunningRecognizeAsync(config, audio);
while (!response.isDone()) {
System.out.println("Waiting for response...");
@@ -311,8 +308,7 @@ public static void asyncRecognizeGcs(String gcsUri) throws Exception, IOExceptio
.build();
// Use non-blocking call for getting file transcription
- OperationFuture response =
+ OperationFuture response =
speech.longRunningRecognizeAsync(config, audio);
while (!response.isDone()) {
System.out.println("Waiting for response...");
diff --git a/storage/cloud-client/pom.xml b/storage/cloud-client/pom.xml
index 84eb3c8b6a7..20d0beba8f2 100644
--- a/storage/cloud-client/pom.xml
+++ b/storage/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-storage
- 1.8.0
+ 1.11.0
diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml
index 214e06cdd20..53f129120ca 100644
--- a/storage/json-api/pom.xml
+++ b/storage/json-api/pom.xml
@@ -38,7 +38,7 @@
com.google.apis
google-api-services-storage
- v1-rev115-1.23.0
+ v1-rev116-1.23.0
com.google.guava
diff --git a/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml
index ac0b868ac6b..bca816b1bba 100644
--- a/storage/storage-transfer/pom.xml
+++ b/storage/storage-transfer/pom.xml
@@ -38,7 +38,7 @@
com.google.apis
google-api-services-storagetransfer
- v1-rev30-1.23.0
+ v1-rev34-1.23.0
com.google.guava
diff --git a/storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml
index 5ae94149fab..713fef07ed8 100644
--- a/storage/xml-api/cmdline-sample/pom.xml
+++ b/storage/xml-api/cmdline-sample/pom.xml
@@ -66,7 +66,7 @@
com.google.apis
google-api-services-storage
- v1-rev115-1.23.0
+ v1-rev116-1.23.0
com.google.guava
diff --git a/taskqueue/deferred/pom.xml b/taskqueue/deferred/pom.xml
index 86c8e46c895..eff7bca920e 100644
--- a/taskqueue/deferred/pom.xml
+++ b/taskqueue/deferred/pom.xml
@@ -63,7 +63,7 @@
org.mockito
mockito-core
- 2.11.0
+ 2.12.0
com.google.appengine
diff --git a/translate/cloud-client/pom.xml b/translate/cloud-client/pom.xml
index 85acafe290d..5f2b7bca18a 100644
--- a/translate/cloud-client/pom.xml
+++ b/translate/cloud-client/pom.xml
@@ -37,7 +37,7 @@
com.google.cloud
google-cloud-translate
- 1.8.0
+ 1.11.0
diff --git a/translate/pom.xml b/translate/pom.xml
index f9f6915f515..6ea04fa2810 100644
--- a/translate/pom.xml
+++ b/translate/pom.xml
@@ -38,7 +38,7 @@ limitations under the License.
com.google.cloud
google-cloud-translate
- 1.8.0
+ 1.11.0
junit
diff --git a/video/cloud-client/pom.xml b/video/cloud-client/pom.xml
index 4abefff547e..959818dcc6f 100644
--- a/video/cloud-client/pom.xml
+++ b/video/cloud-client/pom.xml
@@ -43,7 +43,7 @@
com.google.cloud
google-cloud-video-intelligence
- 0.26.0-beta
+ 0.29.0-beta
diff --git a/video/cloud-client/src/main/java/com/example/video/Detect.java b/video/cloud-client/src/main/java/com/example/video/Detect.java
index 09fd5f879e3..23043145a91 100644
--- a/video/cloud-client/src/main/java/com/example/video/Detect.java
+++ b/video/cloud-client/src/main/java/com/example/video/Detect.java
@@ -16,7 +16,7 @@
package com.example.video;
-import com.google.api.gax.rpc.OperationFuture;
+import com.google.api.gax.longrunning.OperationFuture;
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress;
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest;
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse;
@@ -113,7 +113,7 @@ public static void analyzeFaces(String gcsUri) throws Exception {
.build();
// asynchronously perform facial analysis on videos
- OperationFuture response
+ OperationFuture response
= client.annotateVideoAsync(request);
boolean faceFound = false;
@@ -174,7 +174,7 @@ public static void analyzeLabels(String gcsUri) throws Exception {
.addFeatures(Feature.LABEL_DETECTION)
.build();
// Create an operation that will contain the response when the operation completes.
- OperationFuture operation =
+ OperationFuture operation =
client.annotateVideoAsync(request);
System.out.println("Waiting for operation to complete...");
@@ -261,7 +261,7 @@ public static void analyzeLabelsFile(String filePath) throws Exception {
.build();
// Create an operation that will contain the response when the operation completes.
- OperationFuture operation =
+ OperationFuture operation =
client.annotateVideoAsync(request);
System.out.println("Waiting for operation to complete...");
@@ -344,7 +344,7 @@ public static void analyzeShots(String gcsUri) throws Exception {
.build();
// Create an operation that will contain the response when the operation completes.
- OperationFuture operation =
+ OperationFuture operation =
client.annotateVideoAsync(request);
System.out.println("Waiting for operation to complete...");
@@ -382,7 +382,7 @@ public static void analyzeExplicitContent(String gcsUri) throws Exception {
.addFeatures(Feature.EXPLICIT_CONTENT_DETECTION)
.build();
- OperationFuture operation =
+ OperationFuture operation =
client.annotateVideoAsync(request);
System.out.println("Waiting for operation to complete...");
diff --git a/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java b/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java
index b6f8c8cee75..e4abed0f895 100644
--- a/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java
+++ b/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java
@@ -18,7 +18,7 @@
// [START videointelligence_quickstart]
-import com.google.api.gax.rpc.OperationFuture;
+import com.google.api.gax.longrunning.OperationFuture;
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress;
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest;
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse;
@@ -28,7 +28,6 @@
import com.google.cloud.videointelligence.v1beta2.LabelSegment;
import com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults;
import com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceClient;
-import com.google.longrunning.Operation;
import java.util.List;
public class QuickstartSample {
@@ -48,7 +47,7 @@ public static void main(String[] args) throws Exception {
.addFeatures(Feature.LABEL_DETECTION)
.build();
- OperationFuture operation =
+ OperationFuture operation =
client.annotateVideoAsync(request);
System.out.println("Waiting for operation to complete...");
diff --git a/vision/cloud-client/pom.xml b/vision/cloud-client/pom.xml
index 7bd288d72f2..01553939986 100644
--- a/vision/cloud-client/pom.xml
+++ b/vision/cloud-client/pom.xml
@@ -38,7 +38,7 @@
com.google.cloud
google-cloud-vision
- 0.26.0-beta
+ 0.29.0-beta
diff --git a/vision/face-detection/pom.xml b/vision/face-detection/pom.xml
index 6e2fb706b0a..4c6aa9382a3 100644
--- a/vision/face-detection/pom.xml
+++ b/vision/face-detection/pom.xml
@@ -39,7 +39,7 @@
com.google.apis
google-api-services-vision
- v1-rev365-1.23.0
+ v1-rev366-1.23.0
com.google.api-client
diff --git a/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java b/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java
index aab3ebc1816..67d9999de53 100644
--- a/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java
+++ b/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java
@@ -23,14 +23,14 @@
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.vision.v1.Vision;
import com.google.api.services.vision.v1.VisionScopes;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageRequest;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageResponse;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesRequest;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesResponse;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1FaceAnnotation;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Feature;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Image;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Vertex;
+import com.google.api.services.vision.v1.model.AnnotateImageRequest;
+import com.google.api.services.vision.v1.model.AnnotateImageResponse;
+import com.google.api.services.vision.v1.model.BatchAnnotateImagesRequest;
+import com.google.api.services.vision.v1.model.BatchAnnotateImagesResponse;
+import com.google.api.services.vision.v1.model.FaceAnnotation;
+import com.google.api.services.vision.v1.model.Feature;
+import com.google.api.services.vision.v1.model.Image;
+import com.google.api.services.vision.v1.model.Vertex;
import com.google.common.collect.ImmutableList;
import java.awt.BasicStroke;
@@ -81,7 +81,7 @@ public static void main(String[] args) throws IOException, GeneralSecurityExcept
}
FaceDetectApp app = new FaceDetectApp(getVisionService());
- List faces = app.detectFaces(inputPath, MAX_RESULTS);
+ List faces = app.detectFaces(inputPath, MAX_RESULTS);
System.out.printf("Found %d face%s\n", faces.size(), faces.size() == 1 ? "" : "s");
System.out.printf("Writing to file %s\n", outputPath);
app.writeWithFaces(inputPath, outputPath, faces);
@@ -115,25 +115,25 @@ public FaceDetectApp(Vision vision) {
/**
* Gets up to {@code maxResults} faces for an image stored at {@code path}.
*/
- public List detectFaces(Path path, int maxResults) throws IOException {
+ public List detectFaces(Path path, int maxResults) throws IOException {
byte[] data = Files.readAllBytes(path);
- GoogleCloudVisionV1AnnotateImageRequest request =
- new GoogleCloudVisionV1AnnotateImageRequest()
- .setImage(new GoogleCloudVisionV1Image().encodeContent(data))
+ AnnotateImageRequest request =
+ new AnnotateImageRequest()
+ .setImage(new Image().encodeContent(data))
.setFeatures(ImmutableList.of(
- new GoogleCloudVisionV1Feature()
+ new Feature()
.setType("FACE_DETECTION")
.setMaxResults(maxResults)));
Vision.Images.Annotate annotate =
vision.images()
- .annotate(new GoogleCloudVisionV1BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request)));
+ .annotate(new BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request)));
// Due to a bug: requests to Vision API containing large images fail when GZipped.
annotate.setDisableGZipContent(true);
- GoogleCloudVisionV1BatchAnnotateImagesResponse batchResponse = annotate.execute();
+ BatchAnnotateImagesResponse batchResponse = annotate.execute();
assert batchResponse.getResponses().size() == 1;
- GoogleCloudVisionV1AnnotateImageResponse response = batchResponse.getResponses().get(0);
+ AnnotateImageResponse response = batchResponse.getResponses().get(0);
if (response.getFaceAnnotations() == null) {
throw new IOException(
response.getError() != null
@@ -148,7 +148,7 @@ public List detectFaces(Path path, int maxRes
/**
* Reads image {@code inputPath} and writes {@code outputPath} with {@code faces} outlined.
*/
- private static void writeWithFaces(Path inputPath, Path outputPath, List faces)
+ private static void writeWithFaces(Path inputPath, Path outputPath, List faces)
throws IOException {
BufferedImage img = ImageIO.read(inputPath.toFile());
annotateWithFaces(img, faces);
@@ -158,8 +158,8 @@ private static void writeWithFaces(Path inputPath, Path outputPath, List faces) {
- for (GoogleCloudVisionV1FaceAnnotation face : faces) {
+ public static void annotateWithFaces(BufferedImage img, List faces) {
+ for (FaceAnnotation face : faces) {
annotateWithFace(img, face);
}
}
@@ -167,10 +167,10 @@ public static void annotateWithFaces(BufferedImage img, List faces =
+ List faces =
appUnderTest.detectFaces(Paths.get("data/face.jpg"), MAX_RESULTS);
assertThat(faces).named("face.jpg faces").isNotEmpty();
diff --git a/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java b/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java
index bdf09524910..24642005273 100644
--- a/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java
+++ b/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java
@@ -18,9 +18,9 @@
import static com.google.common.truth.Truth.assertThat;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BoundingPoly;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1FaceAnnotation;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Vertex;
+import com.google.api.services.vision.v1.model.BoundingPoly;
+import com.google.api.services.vision.v1.model.FaceAnnotation;
+import com.google.api.services.vision.v1.model.Vertex;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
@@ -36,21 +36,21 @@
public class FaceDetectAppTest {
@Test public void annotateWithFaces_manyFaces_outlinesFaces() throws Exception {
// Arrange
- ImmutableList faces =
+ ImmutableList faces =
ImmutableList.of(
- new GoogleCloudVisionV1FaceAnnotation()
+ new FaceAnnotation()
.setFdBoundingPoly(
- new GoogleCloudVisionV1BoundingPoly().setVertices(ImmutableList.of(
- new GoogleCloudVisionV1Vertex().setX(10).setY(5),
- new GoogleCloudVisionV1Vertex().setX(20).setY(5),
- new GoogleCloudVisionV1Vertex().setX(20).setY(25),
- new GoogleCloudVisionV1Vertex().setX(10).setY(25)))),
- new GoogleCloudVisionV1FaceAnnotation()
+ new BoundingPoly().setVertices(ImmutableList.of(
+ new Vertex().setX(10).setY(5),
+ new Vertex().setX(20).setY(5),
+ new Vertex().setX(20).setY(25),
+ new Vertex().setX(10).setY(25)))),
+ new FaceAnnotation()
.setFdBoundingPoly(
- new GoogleCloudVisionV1BoundingPoly().setVertices(ImmutableList.of(
- new GoogleCloudVisionV1Vertex().setX(60).setY(50),
- new GoogleCloudVisionV1Vertex().setX(70).setY(60),
- new GoogleCloudVisionV1Vertex().setX(50).setY(60)))));
+ new BoundingPoly().setVertices(ImmutableList.of(
+ new Vertex().setX(60).setY(50),
+ new Vertex().setX(70).setY(60),
+ new Vertex().setX(50).setY(60)))));
BufferedImage img = new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
// Act
diff --git a/vision/label/pom.xml b/vision/label/pom.xml
index 0210ffd752d..445e0dd3c11 100644
--- a/vision/label/pom.xml
+++ b/vision/label/pom.xml
@@ -38,7 +38,7 @@
com.google.apis
google-api-services-vision
- v1-rev365-1.23.0
+ v1-rev366-1.23.0
com.google.api-client
diff --git a/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java b/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java
index 16983c4f592..fd4b62233e8 100644
--- a/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java
+++ b/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java
@@ -23,13 +23,13 @@
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.vision.v1.Vision;
import com.google.api.services.vision.v1.VisionScopes;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageRequest;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageResponse;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesRequest;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesResponse;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Feature;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Image;
+import com.google.api.services.vision.v1.model.AnnotateImageRequest;
+import com.google.api.services.vision.v1.model.AnnotateImageResponse;
+import com.google.api.services.vision.v1.model.BatchAnnotateImagesRequest;
+import com.google.api.services.vision.v1.model.BatchAnnotateImagesResponse;
+import com.google.api.services.vision.v1.model.EntityAnnotation;
+import com.google.api.services.vision.v1.model.Feature;
+import com.google.api.services.vision.v1.model.Image;
import com.google.common.collect.ImmutableList;
import java.io.IOException;
@@ -74,9 +74,9 @@ public static void main(String[] args) throws IOException, GeneralSecurityExcept
/**
* Prints the labels received from the Vision API.
*/
- public static void printLabels(PrintStream out, Path imagePath, List labels) {
+ public static void printLabels(PrintStream out, Path imagePath, List labels) {
out.printf("Labels for image %s:\n", imagePath);
- for (GoogleCloudVisionV1EntityAnnotation label : labels) {
+ for (EntityAnnotation label : labels) {
out.printf(
"\t%s (score: %.3f)\n",
label.getDescription(),
@@ -114,28 +114,28 @@ public LabelApp(Vision vision) {
/**
* Gets up to {@code maxResults} labels for an image stored at {@code path}.
*/
- public List labelImage(Path path, int maxResults) throws IOException {
+ public List labelImage(Path path, int maxResults) throws IOException {
// [START construct_request]
byte[] data = Files.readAllBytes(path);
- GoogleCloudVisionV1AnnotateImageRequest request =
- new GoogleCloudVisionV1AnnotateImageRequest()
- .setImage(new GoogleCloudVisionV1Image().encodeContent(data))
+ AnnotateImageRequest request =
+ new AnnotateImageRequest()
+ .setImage(new Image().encodeContent(data))
.setFeatures(ImmutableList.of(
- new GoogleCloudVisionV1Feature()
+ new Feature()
.setType("LABEL_DETECTION")
.setMaxResults(maxResults)));
Vision.Images.Annotate annotate =
vision.images()
- .annotate(new GoogleCloudVisionV1BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request)));
+ .annotate(new BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request)));
// Due to a bug: requests to Vision API containing large images fail when GZipped.
annotate.setDisableGZipContent(true);
// [END construct_request]
// [START parse_response]
- GoogleCloudVisionV1BatchAnnotateImagesResponse batchResponse = annotate.execute();
+ BatchAnnotateImagesResponse batchResponse = annotate.execute();
assert batchResponse.getResponses().size() == 1;
- GoogleCloudVisionV1AnnotateImageResponse response = batchResponse.getResponses().get(0);
+ AnnotateImageResponse response = batchResponse.getResponses().get(0);
if (response.getLabelAnnotations() == null) {
throw new IOException(
response.getError() != null
diff --git a/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java
index 18f0bcc5512..17886c77432 100644
--- a/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java
+++ b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java
@@ -19,7 +19,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation;
+import com.google.api.services.vision.v1.model.EntityAnnotation;
import com.google.common.collect.ImmutableSet;
import org.junit.Before;
@@ -46,11 +46,11 @@ public class LabelAppIT {
}
@Test public void labelImage_cat_returnsCatDescription() throws Exception {
- List labels =
+ List labels =
appUnderTest.labelImage(Paths.get("data/cat.jpg"), MAX_LABELS);
ImmutableSet.Builder builder = ImmutableSet.builder();
- for (GoogleCloudVisionV1EntityAnnotation label : labels) {
+ for (EntityAnnotation label : labels) {
builder.add(label.getDescription());
}
ImmutableSet descriptions = builder.build();
diff --git a/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java
index afda34c5985..6a238a3d248 100644
--- a/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java
+++ b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java
@@ -18,7 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation;
+import com.google.api.services.vision.v1.model.EntityAnnotation;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
@@ -42,7 +42,7 @@ public class LabelAppTest {
// Act
LabelApp.printLabels(
- out, Paths.get("path/to/some/image.jpg"), ImmutableList.of());
+ out, Paths.get("path/to/some/image.jpg"), ImmutableList.of());
// Assert
assertThat(bout.toString()).contains("No labels found.");
@@ -52,11 +52,11 @@ public class LabelAppTest {
// Arrange
ByteArrayOutputStream bout = new ByteArrayOutputStream();
PrintStream out = new PrintStream(bout);
- ImmutableList labels =
+ ImmutableList labels =
ImmutableList.of(
- new GoogleCloudVisionV1EntityAnnotation().setDescription("dog").setScore(0.7564f),
- new GoogleCloudVisionV1EntityAnnotation().setDescription("husky").setScore(0.67891f),
- new GoogleCloudVisionV1EntityAnnotation().setDescription("poodle").setScore(0.1233f));
+ new EntityAnnotation().setDescription("dog").setScore(0.7564f),
+ new EntityAnnotation().setDescription("husky").setScore(0.67891f),
+ new EntityAnnotation().setDescription("poodle").setScore(0.1233f));
// Act
LabelApp.printLabels(out, Paths.get("path/to/some/image.jpg"), labels);
diff --git a/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml
index d6e766227d4..d1b6586e87b 100644
--- a/vision/landmark-detection/pom.xml
+++ b/vision/landmark-detection/pom.xml
@@ -38,7 +38,7 @@
com.google.apis
google-api-services-vision
- v1-rev365-1.23.0
+ v1-rev366-1.23.0
com.google.api-client
diff --git a/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java b/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java
index 8b5c7b98886..8274ed88f92 100644
--- a/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java
+++ b/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java
@@ -23,14 +23,14 @@
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.vision.v1.Vision;
import com.google.api.services.vision.v1.VisionScopes;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageRequest;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageResponse;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesRequest;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesResponse;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Feature;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Image;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1ImageSource;
+import com.google.api.services.vision.v1.model.AnnotateImageRequest;
+import com.google.api.services.vision.v1.model.AnnotateImageResponse;
+import com.google.api.services.vision.v1.model.BatchAnnotateImagesRequest;
+import com.google.api.services.vision.v1.model.BatchAnnotateImagesResponse;
+import com.google.api.services.vision.v1.model.EntityAnnotation;
+import com.google.api.services.vision.v1.model.Feature;
+import com.google.api.services.vision.v1.model.Image;
+import com.google.api.services.vision.v1.model.ImageSource;
import com.google.common.collect.ImmutableList;
import java.io.IOException;
@@ -68,9 +68,9 @@ public static void main(String[] args) throws IOException, GeneralSecurityExcept
}
DetectLandmark app = new DetectLandmark(getVisionService());
- List landmarks = app.identifyLandmark(args[0], MAX_RESULTS);
+ List landmarks = app.identifyLandmark(args[0], MAX_RESULTS);
System.out.printf("Found %d landmark%s\n", landmarks.size(), landmarks.size() == 1 ? "" : "s");
- for (GoogleCloudVisionV1EntityAnnotation annotation : landmarks) {
+ for (EntityAnnotation annotation : landmarks) {
System.out.printf("\t%s\n", annotation.getDescription());
}
}
@@ -103,24 +103,24 @@ public DetectLandmark(Vision vision) {
/**
* Gets up to {@code maxResults} landmarks for an image stored at {@code uri}.
*/
- public List identifyLandmark(String uri, int maxResults) throws IOException {
- GoogleCloudVisionV1AnnotateImageRequest request =
- new GoogleCloudVisionV1AnnotateImageRequest()
- .setImage(new GoogleCloudVisionV1Image().setSource(
- new GoogleCloudVisionV1ImageSource().setGcsImageUri(uri)))
+ public List identifyLandmark(String uri, int maxResults) throws IOException {
+ AnnotateImageRequest request =
+ new AnnotateImageRequest()
+ .setImage(new Image().setSource(
+ new ImageSource().setGcsImageUri(uri)))
.setFeatures(ImmutableList.of(
- new GoogleCloudVisionV1Feature()
+ new Feature()
.setType("LANDMARK_DETECTION")
.setMaxResults(maxResults)));
Vision.Images.Annotate annotate =
vision.images()
- .annotate(new GoogleCloudVisionV1BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request)));
+ .annotate(new BatchAnnotateImagesRequest().setRequests(ImmutableList.of(request)));
// Due to a bug: requests to Vision API containing large images fail when GZipped.
annotate.setDisableGZipContent(true);
- GoogleCloudVisionV1BatchAnnotateImagesResponse batchResponse = annotate.execute();
+ BatchAnnotateImagesResponse batchResponse = annotate.execute();
assert batchResponse.getResponses().size() == 1;
- GoogleCloudVisionV1AnnotateImageResponse response = batchResponse.getResponses().get(0);
+ AnnotateImageResponse response = batchResponse.getResponses().get(0);
if (response.getLandmarkAnnotations() == null) {
throw new IOException(
response.getError() != null
diff --git a/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java b/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java
index 273156fedd2..bb4c4e04f77 100644
--- a/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java
+++ b/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java
@@ -19,7 +19,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation;
+import com.google.api.services.vision.v1.model.EntityAnnotation;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +49,7 @@ public class DetectLandmarkIT {
}
@Test public void identifyLandmark_withLandmark_returnsKnownLandmark() throws Exception {
- List landmarks = appUnderTest.identifyLandmark(LANDMARK_URI, MAX_RESULTS);
+ List landmarks = appUnderTest.identifyLandmark(LANDMARK_URI, MAX_RESULTS);
assertThat(landmarks).named("water.jpg landmarks").isNotEmpty();
assertThat(landmarks.get(0).getDescription())
diff --git a/vision/text/pom.xml b/vision/text/pom.xml
index 16cda42973e..6f12fbc60ac 100644
--- a/vision/text/pom.xml
+++ b/vision/text/pom.xml
@@ -38,7 +38,7 @@
com.google.apis
google-api-services-vision
- v1-rev365-1.23.0
+ v1-rev366-1.23.0
com.google.api-client
diff --git a/vision/text/src/main/java/com/google/cloud/vision/samples/text/ImageText.java b/vision/text/src/main/java/com/google/cloud/vision/samples/text/ImageText.java
index afbe3c4f5b8..4d695f9401f 100644
--- a/vision/text/src/main/java/com/google/cloud/vision/samples/text/ImageText.java
+++ b/vision/text/src/main/java/com/google/cloud/vision/samples/text/ImageText.java
@@ -16,8 +16,8 @@
package com.google.cloud.vision.samples.text;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation;
-import com.google.api.services.vision.v1.model.GoogleRpcStatus;
+import com.google.api.services.vision.v1.model.EntityAnnotation;
+import com.google.api.services.vision.v1.model.Status;
import java.nio.file.Path;
import java.util.List;
@@ -29,8 +29,8 @@
*/
public class ImageText {
private Path pth;
- private List ts;
- private GoogleRpcStatus err;
+ private List ts;
+ private Status err;
public static Builder builder() {
return new Builder();
@@ -42,19 +42,19 @@ public Path path() {
return this.pth;
}
- public List textAnnotations() {
+ public List textAnnotations() {
return this.ts;
}
@Nullable
- public GoogleRpcStatus error() {
+ public Status error() {
return this.err;
}
public static class Builder {
private Path pth;
- private List ts;
- private GoogleRpcStatus err;
+ private List ts;
+ private Status err;
Builder() {}
@@ -63,12 +63,12 @@ public Builder path(Path path) {
return this;
}
- public Builder textAnnotations(List ts) {
+ public Builder textAnnotations(List ts) {
this.ts = ts;
return this;
}
- public Builder error(@Nullable GoogleRpcStatus err) {
+ public Builder error(@Nullable Status err) {
this.err = err;
return this;
}
diff --git a/vision/text/src/main/java/com/google/cloud/vision/samples/text/TextApp.java b/vision/text/src/main/java/com/google/cloud/vision/samples/text/TextApp.java
index 7c29b113a8e..951dacd00f6 100644
--- a/vision/text/src/main/java/com/google/cloud/vision/samples/text/TextApp.java
+++ b/vision/text/src/main/java/com/google/cloud/vision/samples/text/TextApp.java
@@ -22,14 +22,14 @@
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.vision.v1.Vision;
import com.google.api.services.vision.v1.VisionScopes;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageRequest;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1AnnotateImageResponse;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesRequest;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1BatchAnnotateImagesResponse;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1EntityAnnotation;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Feature;
-import com.google.api.services.vision.v1.model.GoogleCloudVisionV1Image;
-import com.google.api.services.vision.v1.model.GoogleRpcStatus;
+import com.google.api.services.vision.v1.model.AnnotateImageRequest;
+import com.google.api.services.vision.v1.model.AnnotateImageResponse;
+import com.google.api.services.vision.v1.model.BatchAnnotateImagesRequest;
+import com.google.api.services.vision.v1.model.BatchAnnotateImagesResponse;
+import com.google.api.services.vision.v1.model.EntityAnnotation;
+import com.google.api.services.vision.v1.model.Feature;
+import com.google.api.services.vision.v1.model.Image;
+import com.google.api.services.vision.v1.model.Status;
import com.google.common.base.MoreObjects;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
@@ -168,39 +168,39 @@ public void indexDirectory(Path inputPath) throws IOException {
* Gets up to {@code maxResults} text annotations for images stored at {@code paths}.
*/
public ImmutableList detectText(List paths) {
- ImmutableList.Builder requests = ImmutableList.builder();
+ ImmutableList.Builder requests = ImmutableList.builder();
try {
for (Path path : paths) {
byte[] data;
data = Files.readAllBytes(path);
requests.add(
- new GoogleCloudVisionV1AnnotateImageRequest()
- .setImage(new GoogleCloudVisionV1Image().encodeContent(data))
+ new AnnotateImageRequest()
+ .setImage(new Image().encodeContent(data))
.setFeatures(ImmutableList.of(
- new GoogleCloudVisionV1Feature()
+ new Feature()
.setType("TEXT_DETECTION")
.setMaxResults(MAX_RESULTS))));
}
Vision.Images.Annotate annotate =
vision.images()
- .annotate(new GoogleCloudVisionV1BatchAnnotateImagesRequest().setRequests(requests.build()));
+ .annotate(new BatchAnnotateImagesRequest().setRequests(requests.build()));
// Due to a bug: requests to Vision API containing large images fail when GZipped.
annotate.setDisableGZipContent(true);
- GoogleCloudVisionV1BatchAnnotateImagesResponse batchResponse = annotate.execute();
+ BatchAnnotateImagesResponse batchResponse = annotate.execute();
assert batchResponse.getResponses().size() == paths.size();
ImmutableList.Builder output = ImmutableList.builder();
for (int i = 0; i < paths.size(); i++) {
Path path = paths.get(i);
- GoogleCloudVisionV1AnnotateImageResponse response = batchResponse.getResponses().get(i);
+ AnnotateImageResponse response = batchResponse.getResponses().get(i);
output.add(
ImageText.builder()
.path(path)
.textAnnotations(
MoreObjects.firstNonNull(
response.getTextAnnotations(),
- ImmutableList.of()))
+ ImmutableList.of()))
.error(response.getError())
.build());
}
@@ -212,8 +212,8 @@ public ImmutableList detectText(List paths) {
output.add(
ImageText.builder()
.path(path)
- .textAnnotations(ImmutableList.of())
- .error(new GoogleRpcStatus().setMessage(ex.getMessage()))
+ .textAnnotations(ImmutableList.of())
+ .error(new Status().setMessage(ex.getMessage()))
.build());
}
return output.build();
@@ -236,7 +236,7 @@ public boolean successfullyDetectedText(ImageText image) {
*/
public Word extractDescriptions(ImageText image) {
String document = "";
- for (GoogleCloudVisionV1EntityAnnotation text : image.textAnnotations()) {
+ for (EntityAnnotation text : image.textAnnotations()) {
document += text.getDescription();
}
if (document.equals("")) {