updating video intelligence sample to 0.21.1-alpha (GoogleCloudPlatform#812)

jabubake · lesv · commit 6661719c17df · 2017-08-18T15:39:34.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,7 @@
         <module>translate/cloud-client</module>
 
         <module>unittests</module>
-
+        <module>video/cloud-client</module>
         <module>vision/cloud-client</module>
         <module>vision/face-detection</module>
         <module>vision/label</module>
diff --git a/video/cloud-client/pom.xml b/video/cloud-client/pom.xml
@@ -40,25 +40,10 @@
       <artifactId>guava</artifactId>
       <version>20.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud</artifactId>
-      <version>0.20.1-alpha</version>
-    </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-video-intelligence</artifactId>
-      <version>0.20.1-alpha</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auth</groupId>
-        <artifactId>google-auth-library-credentials</artifactId>
-      <version>0.6.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.oauth-client</groupId>
-      <artifactId>google-oauth-client-jetty</artifactId>
-      <version>1.22.0</version>
+      <version>0.21.1-alpha</version>
     </dependency>
     <!-- [END dependencies] -->
 
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
@@ -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<AnnotateVideoResponse, AnnotateVideoProgress> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> 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<AnnotateVideoResponse, AnnotateVideoProgress> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> 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<AnnotateVideoResponse, AnnotateVideoProgress> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> 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<AnnotateVideoResponse, AnnotateVideoProgress> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> 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<AnnotateVideoResponse, AnnotateVideoProgress> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> 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
@@ -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<AnnotateVideoResponse, AnnotateVideoProgress> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> operation =
             client.annotateVideoAsync(request);
 
     System.out.println("Waiting for operation to complete...");
