samples: updates face and people to v1 (#449)

* samples: updates face and people to v1 * fix: appease the linter
GoogleCloudPlatform · Apr 5, 2021 · cadbf52 · cadbf52
1 parent bd8b41d
commit cadbf52
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 34 deletions.
diff --git a/video/src/main/java/com/example/video/Detect.java b/video/src/main/java/com/example/video/Detect.java
@@ -45,6 +45,7 @@
 public class Detect {
   /**
    * Detects labels, shots, and explicit content in a video using the Video Intelligence API
+   *
    * @param args specifies features to detect and the path to the video on Google Cloud Storage.
    */
   public static void main(String[] args) {
@@ -58,6 +59,7 @@ public static void main(String[] args) {
 
   /**
    * Helper that handles the input passed to the program.
+   *
    * @param args specifies features to detect and the path to the video on Google Cloud Storage.
    *
    * @throws IOException on Input/Output errors.

diff --git a/...src/main/java/beta/video/DetectFaces.java → video/src/main/java/video/DetectFaces.java b/...src/main/java/beta/video/DetectFaces.java → video/src/main/java/video/DetectFaces.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package beta.video;
+package video;
 
-// [START video_detect_faces_beta]
+// [START video_detect_faces]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoProgress;
-import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoRequest;
-import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoResponse;
-import com.google.cloud.videointelligence.v1p3beta1.DetectedAttribute;
-import com.google.cloud.videointelligence.v1p3beta1.FaceDetectionAnnotation;
-import com.google.cloud.videointelligence.v1p3beta1.FaceDetectionConfig;
-import com.google.cloud.videointelligence.v1p3beta1.Feature;
-import com.google.cloud.videointelligence.v1p3beta1.TimestampedObject;
-import com.google.cloud.videointelligence.v1p3beta1.Track;
-import com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults;
-import com.google.cloud.videointelligence.v1p3beta1.VideoContext;
-import com.google.cloud.videointelligence.v1p3beta1.VideoIntelligenceServiceClient;
-import com.google.cloud.videointelligence.v1p3beta1.VideoSegment;
+import com.google.cloud.videointelligence.v1.AnnotateVideoProgress;
+import com.google.cloud.videointelligence.v1.AnnotateVideoRequest;
+import com.google.cloud.videointelligence.v1.AnnotateVideoResponse;
+import com.google.cloud.videointelligence.v1.DetectedAttribute;
+import com.google.cloud.videointelligence.v1.FaceDetectionAnnotation;
+import com.google.cloud.videointelligence.v1.FaceDetectionConfig;
+import com.google.cloud.videointelligence.v1.Feature;
+import com.google.cloud.videointelligence.v1.TimestampedObject;
+import com.google.cloud.videointelligence.v1.Track;
+import com.google.cloud.videointelligence.v1.VideoAnnotationResults;
+import com.google.cloud.videointelligence.v1.VideoContext;
+import com.google.cloud.videointelligence.v1.VideoIntelligenceServiceClient;
+import com.google.cloud.videointelligence.v1.VideoSegment;
 import com.google.protobuf.ByteString;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -109,4 +109,4 @@ public static void detectFaces(String localFilePath) throws Exception {
     }
   }
 }
-// [END video_detect_faces_beta]
+// [END video_detect_faces]
diff --git a/.../main/java/beta/video/DetectFacesGcs.java → ...o/src/main/java/video/DetectFacesGcs.java b/.../main/java/beta/video/DetectFacesGcs.java → ...o/src/main/java/video/DetectFacesGcs.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package beta.video;
+package video;
 
-// [START video_detect_faces_gcs_beta]
+// [START video_detect_faces_gcs]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoProgress;
-import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoRequest;
-import com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoResponse;
-import com.google.cloud.videointelligence.v1p3beta1.DetectedAttribute;
-import com.google.cloud.videointelligence.v1p3beta1.FaceDetectionAnnotation;
-import com.google.cloud.videointelligence.v1p3beta1.FaceDetectionConfig;
-import com.google.cloud.videointelligence.v1p3beta1.Feature;
-import com.google.cloud.videointelligence.v1p3beta1.TimestampedObject;
-import com.google.cloud.videointelligence.v1p3beta1.Track;
-import com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults;
-import com.google.cloud.videointelligence.v1p3beta1.VideoContext;
-import com.google.cloud.videointelligence.v1p3beta1.VideoIntelligenceServiceClient;
-import com.google.cloud.videointelligence.v1p3beta1.VideoSegment;
+import com.google.cloud.videointelligence.v1.AnnotateVideoProgress;
+import com.google.cloud.videointelligence.v1.AnnotateVideoRequest;
+import com.google.cloud.videointelligence.v1.AnnotateVideoResponse;
+import com.google.cloud.videointelligence.v1.DetectedAttribute;
+import com.google.cloud.videointelligence.v1.FaceDetectionAnnotation;
+import com.google.cloud.videointelligence.v1.FaceDetectionConfig;
+import com.google.cloud.videointelligence.v1.Feature;
+import com.google.cloud.videointelligence.v1.TimestampedObject;
+import com.google.cloud.videointelligence.v1.Track;
+import com.google.cloud.videointelligence.v1.VideoAnnotationResults;
+import com.google.cloud.videointelligence.v1.VideoContext;
+import com.google.cloud.videointelligence.v1.VideoIntelligenceServiceClient;
+import com.google.cloud.videointelligence.v1.VideoSegment;
 
 public class DetectFacesGcs {
 
@@ -101,4 +101,4 @@ public static void detectFacesGcs(String gcsUri) throws Exception {
     }
   }
 }
-// [END video_detect_faces_gcs_beta]
+// [END video_detect_faces_gcs]
diff --git a/...est/java/beta/video/DetectFacesGcsIT.java → ...src/test/java/video/DetectFacesGcsIT.java b/...est/java/beta/video/DetectFacesGcsIT.java → ...src/test/java/video/DetectFacesGcsIT.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package beta.video;
+package video;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -23,6 +23,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import video.DetectFacesGcs;
 
 @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
 public class DetectFacesGcsIT {

diff --git a/...c/test/java/beta/video/DetectFacesIT.java → video/src/test/java/video/DetectFacesIT.java b/...c/test/java/beta/video/DetectFacesIT.java → video/src/test/java/video/DetectFacesIT.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package beta.video;
+package video;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -23,6 +23,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import video.DetectFaces;
 
 @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
 public class DetectFacesIT {