diff --git a/video/src/main/java/com/example/video/Detect.java b/video/src/main/java/com/example/video/Detect.java index a2c5bd1c36f..b917c1edbe6 100644 --- 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/video/src/main/java/beta/video/DetectFaces.java b/video/src/main/java/video/DetectFaces.java similarity index 79% rename from video/src/main/java/beta/video/DetectFaces.java rename to video/src/main/java/video/DetectFaces.java index 423fed97ae0..71e45aec93f 100644 --- a/video/src/main/java/beta/video/DetectFaces.java +++ b/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/video/src/main/java/beta/video/DetectFacesGcs.java b/video/src/main/java/video/DetectFacesGcs.java similarity index 77% rename from video/src/main/java/beta/video/DetectFacesGcs.java rename to video/src/main/java/video/DetectFacesGcs.java index 06f69d4fc21..ec41d6d572b 100644 --- a/video/src/main/java/beta/video/DetectFacesGcs.java +++ b/video/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/video/src/test/java/beta/video/DetectFacesGcsIT.java b/video/src/test/java/video/DetectFacesGcsIT.java similarity index 97% rename from video/src/test/java/beta/video/DetectFacesGcsIT.java rename to video/src/test/java/video/DetectFacesGcsIT.java index bae5b170cbf..917b6bc4d24 100644 --- a/video/src/test/java/beta/video/DetectFacesGcsIT.java +++ b/video/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/video/src/test/java/beta/video/DetectFacesIT.java b/video/src/test/java/video/DetectFacesIT.java similarity index 97% rename from video/src/test/java/beta/video/DetectFacesIT.java rename to video/src/test/java/video/DetectFacesIT.java index fbc4a3095a9..384711597e3 100644 --- a/video/src/test/java/beta/video/DetectFacesIT.java +++ b/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 {