Merge pull request #750 from GoogleCloudPlatform/video-version-bump

Adds instructions for Windows and upgrades client library versions.
GoogleCloudPlatform · Jul 14, 2017 · bd564e8 · bd564e8
2 parents 0756f07 + 14400b8
commit bd564e8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 29 deletions.
diff --git a/video/cloud-client/README.md b/video/cloud-client/README.md
@@ -59,3 +59,12 @@ Detect Shots
 java -cp target/video-google-cloud-samples-1.0.0-jar-with-dependencies.jar \
     com.example.video.Detect shots gs://cloudmleap/video/next/gbikes_dinosaur.mp4
 ```
+
+From Windows, you may need to supply your classpath diferently, for example:
+```
+java -cp target\\video-google-cloud-samples-1.0.0-jar-with-dependencies.jar com.example.video.Detect labels gs://demomaker/cat.mp4
+```
+or
+```
+java -cp target\\video-google-cloud-samples-1.0.0-jar-with-dependencies.jar com.example.video.Detect labels-file resources\\cat.mp4
+```
diff --git a/video/cloud-client/pom.xml b/video/cloud-client/pom.xml
@@ -43,39 +43,22 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud</artifactId>
-      <version>0.18.0-alpha</version>
-      <exclusions>
-        <exclusion> <!-- exclude an old version of Guava -->
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava-jdk5</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>0.20.1-alpha</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-video-intelligence</artifactId>
-      <version>0.20.0-alpha</version>
-      <exclusions>
-        <exclusion> <!-- exclude an old version of Guava -->
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava-jdk5</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>0.20.1-alpha</version>
     </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>
-      <artifactId>google-auth-library-oauth2-http</artifactId>
-      <version>0.6.1</version>
-     </dependency>
-     <dependency>
-      <groupId>com.google.auth</groupId>
-      <artifactId>google-auth-library-credentials</artifactId>
+        <artifactId>google-auth-library-credentials</artifactId>
       <version>0.6.1</version>
     </dependency>
     <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-      <version>1.1.33.Fork26</version>
+      <groupId>com.google.oauth-client</groupId>
+      <artifactId>google-oauth-client-jetty</artifactId>
+      <version>1.22.0</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
@@ -17,6 +17,7 @@
 package com.example.video;
 
 import com.google.api.gax.grpc.OperationFuture;
+import com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress;
 import com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest;
 import com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse;
 import com.google.cloud.videointelligence.v1beta1.FaceAnnotation;
@@ -111,7 +112,7 @@ public static void analyzeFaces(String gcsUri) throws ExecutionException,
             .addFeatures(Feature.FACE_DETECTION)
             .build();
 
-    OperationFuture<AnnotateVideoResponse> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
             client.annotateVideoAsync(request);
 
     System.out.println("Waiting for operation to complete...");
@@ -151,7 +152,7 @@ public static void analyzeLabels(String gcsUri) throws
             .addFeatures(Feature.LABEL_DETECTION)
             .build();
 
-    OperationFuture<AnnotateVideoResponse> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
             client.annotateVideoAsync(request);
 
     System.out.println("Waiting for operation to complete...");
@@ -199,7 +200,7 @@ public static void analyzeLabelsFile(String filePath) throws
         .addFeatures(Feature.LABEL_DETECTION)
         .build();
 
-    OperationFuture<AnnotateVideoResponse> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
         client.annotateVideoAsync(request);
 
     System.out.println("Waiting for operation to complete...");
@@ -244,7 +245,7 @@ public static void analyzeShots(String gcsUri)
             .addFeatures(Feature.SHOT_CHANGE_DETECTION)
             .build();
 
-    OperationFuture<AnnotateVideoResponse> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
             client.annotateVideoAsync(request);
 
     System.out.println("Waiting for operation to complete...");
@@ -284,7 +285,7 @@ public static void analyzeSafeSearch(String gcsUri)
             .addFeatures(Feature.SAFE_SEARCH_DETECTION)
             .build();
 
-    OperationFuture<AnnotateVideoResponse> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> 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
@@ -18,6 +18,7 @@
 
 // [START videointelligence_quickstart]
 import com.google.api.gax.grpc.OperationFuture;
+import com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress;
 import com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest;
 import com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse;
 import com.google.cloud.videointelligence.v1beta1.Feature;
@@ -48,7 +49,7 @@ public static void main(String[] args) throws
             .addFeatures(Feature.LABEL_DETECTION)
             .build();
 
-    OperationFuture<AnnotateVideoResponse> operation =
+    OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
             client.annotateVideoAsync(request);
 
     System.out.println("Waiting for operation to complete...");