From 380efa9a5b7f26b0d53d359ba2c6da450ab252ce Mon Sep 17 00:00:00 2001 From: Jisha Abubaker Date: Wed, 16 Aug 2017 14:26:55 -0700 Subject: [PATCH] updating video intelligence sample to 0.21.1-alpha --- pom.xml | 2 +- video/cloud-client/pom.xml | 17 +---------------- .../src/main/java/com/example/video/Detect.java | 16 ++++++++-------- .../com/example/video/QuickstartSample.java | 7 ++++--- 4 files changed, 14 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index e4405b64b0a..3482228d356 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ translate/cloud-client unittests - + video/cloud-client vision/cloud-client vision/face-detection vision/label diff --git a/video/cloud-client/pom.xml b/video/cloud-client/pom.xml index 24cc621503b..df0eeb692b6 100644 --- a/video/cloud-client/pom.xml +++ b/video/cloud-client/pom.xml @@ -40,25 +40,10 @@ guava 20.0 - - com.google.cloud - google-cloud - 0.20.1-alpha - com.google.cloud google-cloud-video-intelligence - 0.20.1-alpha - - - com.google.auth - google-auth-library-credentials - 0.6.1 - - - com.google.oauth-client - google-oauth-client-jetty - 1.22.0 + 0.21.1-alpha 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 3dd6e3d5aa6..4444ff492a8 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.grpc.OperationFuture; +import com.google.api.gax.rpc.OperationFuture; import com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress; import com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest; import com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse; @@ -30,13 +30,13 @@ import com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceClient; import com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceSettings; import com.google.cloud.videointelligence.v1beta1.VideoSegment; -import org.apache.commons.codec.binary.Base64; - +import com.google.longrunning.Operation; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.concurrent.ExecutionException; +import org.apache.commons.codec.binary.Base64; public class Detect { @@ -112,7 +112,7 @@ public static void analyzeFaces(String gcsUri) throws ExecutionException, .addFeatures(Feature.FACE_DETECTION) .build(); - OperationFuture operation = + OperationFuture operation = client.annotateVideoAsync(request); System.out.println("Waiting for operation to complete..."); @@ -152,7 +152,7 @@ public static void analyzeLabels(String gcsUri) throws .addFeatures(Feature.LABEL_DETECTION) .build(); - OperationFuture operation = + OperationFuture operation = client.annotateVideoAsync(request); System.out.println("Waiting for operation to complete..."); @@ -200,7 +200,7 @@ public static void analyzeLabelsFile(String filePath) throws .addFeatures(Feature.LABEL_DETECTION) .build(); - OperationFuture operation = + OperationFuture operation = client.annotateVideoAsync(request); System.out.println("Waiting for operation to complete..."); @@ -245,7 +245,7 @@ public static void analyzeShots(String gcsUri) .addFeatures(Feature.SHOT_CHANGE_DETECTION) .build(); - OperationFuture operation = + OperationFuture operation = client.annotateVideoAsync(request); System.out.println("Waiting for operation to complete..."); @@ -285,7 +285,7 @@ public static void analyzeSafeSearch(String gcsUri) .addFeatures(Feature.SAFE_SEARCH_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 3b4b0dc376b..dbf166eb567 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 @@ -17,7 +17,8 @@ package com.example.video; // [START videointelligence_quickstart] -import com.google.api.gax.grpc.OperationFuture; + +import com.google.api.gax.rpc.OperationFuture; import com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress; import com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest; import com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse; @@ -27,7 +28,7 @@ import com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults; import com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceClient; import com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceSettings; - +import com.google.longrunning.Operation; import java.io.IOException; import java.util.concurrent.ExecutionException; @@ -49,7 +50,7 @@ public static void main(String[] args) throws .addFeatures(Feature.LABEL_DETECTION) .build(); - OperationFuture operation = + OperationFuture operation = client.annotateVideoAsync(request); System.out.println("Waiting for operation to complete...");