fix: use correct child_type annotation (#6578)

PiperOrigin-RevId: 558967926 Source-Link: googleapis/googleapis@1c4f24e Source-Link: googleapis/googleapis-gen@a25a444 Copy-Tag: eyJwIjoiVmlkZW9TdGl0Y2hlci8uT3dsQm90LnlhbWwiLCJoIjoiYTI1YTQ0NDZiNWQ3YWYyMDQ1NzQzMmMzODU2YmMyNTlkNDU4NWRmOSJ9
googleapis · Aug 22, 2023 · a6a62dd · a6a62dd
1 parent 7b93667
commit a6a62dd
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 41 deletions.
diff --git a/VideoStitcher/metadata/V1/VideoStitcherService.php b/VideoStitcher/metadata/V1/VideoStitcherService.php
diff --git a/VideoStitcher/samples/V1/VideoStitcherServiceClient/create_live_session.php b/VideoStitcher/samples/V1/VideoStitcherServiceClient/create_live_session.php
@@ -33,7 +33,7 @@
  *
  * @param string $formattedParent                The project and location in which the live session should be
  *                                               created, in the form of `projects/{project_number}/locations/{location}`. Please see
- *                                               {@see VideoStitcherServiceClient::liveSessionName()} for help formatting this field.
+ *                                               {@see VideoStitcherServiceClient::locationName()} for help formatting this field.
  * @param string $formattedLiveSessionLiveConfig The resource name of the live config for this session, in the
  *                                               form of `projects/{project}/locations/{location}/liveConfigs/{id}`. Please see
  *                                               {@see VideoStitcherServiceClient::liveConfigName()} for help formatting this field.
@@ -73,11 +73,7 @@ function create_live_session_sample(
  */
 function callSample(): void
 {
-    $formattedParent = VideoStitcherServiceClient::liveSessionName(
-        '[PROJECT]',
-        '[LOCATION]',
-        '[LIVE_SESSION]'
-    );
+    $formattedParent = VideoStitcherServiceClient::locationName('[PROJECT]', '[LOCATION]');
     $formattedLiveSessionLiveConfig = VideoStitcherServiceClient::liveConfigName(
         '[PROJECT]',
         '[LOCATION]',

diff --git a/VideoStitcher/samples/V1/VideoStitcherServiceClient/create_vod_session.php b/VideoStitcher/samples/V1/VideoStitcherServiceClient/create_vod_session.php
@@ -38,9 +38,7 @@
  *                                     {@see VideoStitcherServiceClient::locationName()} for help formatting this field.
  * @param string $vodSessionSourceUri  URI of the media to stitch.
  * @param string $vodSessionAdTagUri   Ad tag URI.
- * @param int    $vodSessionAdTracking Determines how the ad should be tracked. If
- *                                     [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
- *                                     is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+ * @param int    $vodSessionAdTracking Determines how the ad should be tracked.
  */
 function create_vod_session_sample(
     string $formattedParent,

diff --git a/VideoStitcher/src/V1/CreateLiveSessionRequest.php b/VideoStitcher/src/V1/CreateLiveSessionRequest.php
diff --git a/VideoStitcher/src/V1/Gapic/VideoStitcherServiceGapicClient.php b/VideoStitcher/src/V1/Gapic/VideoStitcherServiceGapicClient.php
@@ -856,7 +856,7 @@ public function createLiveConfig(
      * ```
      * $videoStitcherServiceClient = new VideoStitcherServiceClient();
      * try {
-     *     $formattedParent = $videoStitcherServiceClient->liveSessionName('[PROJECT]', '[LOCATION]', '[LIVE_SESSION]');
+     *     $formattedParent = $videoStitcherServiceClient->locationName('[PROJECT]', '[LOCATION]');
      *     $liveSession = new LiveSession();
      *     $response = $videoStitcherServiceClient->createLiveSession($formattedParent, $liveSession);
      * } finally {

diff --git a/VideoStitcher/src/V1/LiveSession/GamSettings.php b/VideoStitcher/src/V1/LiveSession/GamSettings.php
diff --git a/VideoStitcher/src/V1/VodAdTagDetail.php b/VideoStitcher/src/V1/VodAdTagDetail.php
diff --git a/VideoStitcher/src/V1/VodSession.php b/VideoStitcher/src/V1/VodSession.php
diff --git a/VideoStitcher/src/V1/VodStitchDetail.php b/VideoStitcher/src/V1/VodStitchDetail.php
diff --git a/VideoStitcher/src/V1/resources/video_stitcher_service_client_config.json b/VideoStitcher/src/V1/resources/video_stitcher_service_client_config.json
@@ -45,8 +45,8 @@
                 },
                 "CreateLiveConfig": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "retry_policy_1_codes",
-                    "retry_params_name": "retry_policy_1_params"
+                    "retry_codes_name": "no_retry_1_codes",
+                    "retry_params_name": "no_retry_1_params"
                 },
                 "CreateLiveSession": {
                     "timeout_millis": 60000,
@@ -70,8 +70,8 @@
                 },
                 "DeleteLiveConfig": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "retry_policy_1_codes",
-                    "retry_params_name": "retry_policy_1_params"
+                    "retry_codes_name": "no_retry_1_codes",
+                    "retry_params_name": "no_retry_1_params"
                 },
                 "DeleteSlate": {
                     "timeout_millis": 60000,
@@ -90,8 +90,8 @@
                 },
                 "GetLiveConfig": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "retry_policy_1_codes",
-                    "retry_params_name": "retry_policy_1_params"
+                    "retry_codes_name": "no_retry_1_codes",
+                    "retry_params_name": "no_retry_1_params"
                 },
                 "GetLiveSession": {
                     "timeout_millis": 60000,
@@ -130,8 +130,8 @@
                 },
                 "ListLiveConfigs": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "retry_policy_1_codes",
-                    "retry_params_name": "retry_policy_1_params"
+                    "retry_codes_name": "no_retry_1_codes",
+                    "retry_params_name": "no_retry_1_params"
                 },
                 "ListSlates": {
                     "timeout_millis": 60000,

diff --git a/VideoStitcher/tests/Unit/V1/Client/VideoStitcherServiceClientTest.php b/VideoStitcher/tests/Unit/V1/Client/VideoStitcherServiceClientTest.php
@@ -407,7 +407,7 @@ public function createLiveSessionTest()
         $expectedResponse->setLiveConfig($liveConfig);
         $transport->addResponse($expectedResponse);
         // Mock request
-        $formattedParent = $gapicClient->liveSessionName('[PROJECT]', '[LOCATION]', '[LIVE_SESSION]');
+        $formattedParent = $gapicClient->locationName('[PROJECT]', '[LOCATION]');
         $liveSession = new LiveSession();
         $liveSessionLiveConfig = $gapicClient->liveConfigName('[PROJECT]', '[LOCATION]', '[LIVE_CONFIG]');
         $liveSession->setLiveConfig($liveSessionLiveConfig);
@@ -447,7 +447,7 @@ public function createLiveSessionExceptionTest()
         ], JSON_PRETTY_PRINT);
         $transport->addResponse(null, $status);
         // Mock request
-        $formattedParent = $gapicClient->liveSessionName('[PROJECT]', '[LOCATION]', '[LIVE_SESSION]');
+        $formattedParent = $gapicClient->locationName('[PROJECT]', '[LOCATION]');
         $liveSession = new LiveSession();
         $liveSessionLiveConfig = $gapicClient->liveConfigName('[PROJECT]', '[LOCATION]', '[LIVE_CONFIG]');
         $liveSession->setLiveConfig($liveSessionLiveConfig);

diff --git a/VideoStitcher/tests/Unit/V1/VideoStitcherServiceClientTest.php b/VideoStitcher/tests/Unit/V1/VideoStitcherServiceClientTest.php
@@ -367,7 +367,7 @@ public function createLiveSessionTest()
         $expectedResponse->setLiveConfig($liveConfig);
         $transport->addResponse($expectedResponse);
         // Mock request
-        $formattedParent = $gapicClient->liveSessionName('[PROJECT]', '[LOCATION]', '[LIVE_SESSION]');
+        $formattedParent = $gapicClient->locationName('[PROJECT]', '[LOCATION]');
         $liveSession = new LiveSession();
         $liveSessionLiveConfig = $gapicClient->liveConfigName('[PROJECT]', '[LOCATION]', '[LIVE_CONFIG]');
         $liveSession->setLiveConfig($liveSessionLiveConfig);
@@ -404,7 +404,7 @@ public function createLiveSessionExceptionTest()
         ], JSON_PRETTY_PRINT);
         $transport->addResponse(null, $status);
         // Mock request
-        $formattedParent = $gapicClient->liveSessionName('[PROJECT]', '[LOCATION]', '[LIVE_SESSION]');
+        $formattedParent = $gapicClient->locationName('[PROJECT]', '[LOCATION]');
         $liveSession = new LiveSession();
         $liveSessionLiveConfig = $gapicClient->liveConfigName('[PROJECT]', '[LOCATION]', '[LIVE_CONFIG]');
         $liveSession->setLiveConfig($liveSessionLiveConfig);