From e45bf0efb754581f84d08fb37364345e7dbdc794 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Wed, 6 Dec 2023 13:50:41 -0600 Subject: [PATCH] feat: mark new surface GA and previous surface deprecated (#674) --- src/Generation/GapicClientGenerator.php | 13 ++++++------- src/Generation/GapicClientV2Generator.php | 14 +------------- .../asset/src/V1/Gapic/AssetServiceGapicClient.php | 2 ++ .../src/V1/Gapic/AddressesGapicClient.php | 2 ++ .../src/V1/Gapic/RegionOperationsGapicClient.php | 2 ++ .../src/V1/Gapic/ClusterManagerGapicClient.php | 2 ++ .../Gapic/AutoscalingPolicyServiceGapicClient.php | 2 ++ .../src/V1/Gapic/ClusterControllerGapicClient.php | 2 ++ .../src/V1/Gapic/JobControllerGapicClient.php | 2 ++ .../Gapic/WorkflowTemplateServiceGapicClient.php | 2 ++ .../src/V1/Client/CloudFunctionsServiceClient.php | 4 ---- .../iam/src/V1/Gapic/IAMPolicyGapicClient.php | 2 ++ .../V1/Gapic/KeyManagementServiceGapicClient.php | 2 ++ .../src/V2/Gapic/ConfigServiceV2GapicClient.php | 2 ++ .../src/V2/Gapic/LoggingServiceV2GapicClient.php | 2 ++ .../src/V2/Gapic/MetricsServiceV2GapicClient.php | 2 ++ .../redis/src/V1/Client/CloudRedisClient.php | 5 ----- .../redis/src/V1/Gapic/CloudRedisGapicClient.php | 3 +-- .../V2alpha/Gapic/CatalogServiceGapicClient.php | 2 ++ .../V2alpha/Gapic/CompletionServiceGapicClient.php | 2 ++ .../V2alpha/Gapic/PredictionServiceGapicClient.php | 2 ++ .../V2alpha/Gapic/ProductServiceGapicClient.php | 2 ++ .../src/V2alpha/Gapic/SearchServiceGapicClient.php | 2 ++ .../V2alpha/Gapic/UserEventServiceGapicClient.php | 2 ++ .../src/V1/Client/SecurityCenterClient.php | 6 ------ .../src/V1/Gapic/SecurityCenterGapicClient.php | 4 +--- .../speech/src/V1/Gapic/SpeechGapicClient.php | 2 ++ .../Gapic/ApplicationServiceGapicClient.php | 2 ++ .../V4beta1/Gapic/CompanyServiceGapicClient.php | 2 ++ .../src/V4beta1/Gapic/CompletionGapicClient.php | 2 ++ .../src/V4beta1/Gapic/EventServiceGapicClient.php | 2 ++ .../src/V4beta1/Gapic/JobServiceGapicClient.php | 2 ++ .../V4beta1/Gapic/ProfileServiceGapicClient.php | 2 ++ .../src/V4beta1/Gapic/TenantServiceGapicClient.php | 2 ++ .../Gapic/VideoIntelligenceServiceGapicClient.php | 2 ++ tests/Tools/ConfigLoader.php | 2 +- .../Basic/out/src/Client/BasicClient.php | 4 ---- .../src/Gapic/BasicBidiStreamingGapicClient.php | 2 ++ .../src/Gapic/BasicClientStreamingGapicClient.php | 2 ++ .../out/src/Gapic/LibraryGapicClient.php | 2 ++ .../BasicLro/out/src/Gapic/BasicLroGapicClient.php | 2 ++ .../out/src/Gapic/BasicOneofGapicClient.php | 2 ++ .../out/src/Client/BasicOneofNewClient.php | 4 ---- .../out/src/Gapic/BasicPaginatedGapicClient.php | 2 ++ .../src/Gapic/BasicServerStreamingGapicClient.php | 2 ++ .../out/src/Gapic/CustomLroGapicClient.php | 2 ++ .../src/Gapic/CustomLroOperationsGapicClient.php | 2 ++ .../out/src/Gapic/DisableSnippetsGapicClient.php | 2 ++ .../GrpcServiceConfigWithRetry1GapicClient.php | 2 ++ .../out/src/Client/ResourceNamesClient.php | 5 ----- .../out/src/Gapic/ResourceNamesGapicClient.php | 3 +-- .../out/src/Client/RoutingHeadersClient.php | 5 ----- .../out/src/Gapic/RoutingHeadersGapicClient.php | 3 +-- 53 files changed, 90 insertions(+), 63 deletions(-) diff --git a/src/Generation/GapicClientGenerator.php b/src/Generation/GapicClientGenerator.php index 779a565b2..d3b9675c4 100644 --- a/src/Generation/GapicClientGenerator.php +++ b/src/Generation/GapicClientGenerator.php @@ -120,14 +120,13 @@ private function generateClass(): PhpClass 'a parseName method to extract the individual identifiers contained within formatted names ' . 'that are returned by the API.' ), - // If this service contains both client surfaces, link to the new surface. - in_array($this->serviceDetails->migrationMode, [MigrationMode::MIGRATING, MigrationMode::MIGRATION_MODE_UNSPECIFIED]) - ? PhpDoc::text( - 'This service has a new (beta) implementation. See {@see ' . - $this->serviceDetails->gapicClientV2Type->getFullname() . '} to use the new surface.' - ) : null, $this->serviceDetails->isGa() ? null : PhpDoc::experimental(), - !$this->serviceDetails->isDeprecated ? null : PhpDoc::deprecated(ServiceDetails::DEPRECATED_MSG) + PhpDoc::deprecated( + // If this service contains both client surfaces, link to the new surface. + in_array($this->serviceDetails->migrationMode, [MigrationMode::MIGRATING, MigrationMode::MIGRATION_MODE_UNSPECIFIED]) + ? 'Please use the new service client {@see ' . $this->serviceDetails->gapicClientV2Type->getFullname() . '}.' + : ServiceDetails::DEPRECATED_MSG + ) )) ->withTrait($this->ctx->type(Type::fromName(\Google\ApiCore\GapicClientTrait::class))) ->withMember($this->serviceName()) diff --git a/src/Generation/GapicClientV2Generator.php b/src/Generation/GapicClientV2Generator.php index b7df4f71a..e4958ca23 100644 --- a/src/Generation/GapicClientV2Generator.php +++ b/src/Generation/GapicClientV2Generator.php @@ -127,19 +127,7 @@ private function generateClass(): PhpClass 'a parseName method to extract the individual identifiers contained within formatted names ' . 'that are returned by the API.' ), - // TODO(#594): Uncomment this and remove the following two lines when stable. - // $this->serviceDetails->isGa() ? null : PhpDoc::experimental(), - PhpDoc::text( - 'This class is currently experimental and may be subject to changes.' . - // If this service is GA and contains both client surfaces, link to the stable surface. - ($this->serviceDetails->isGa() && in_array( - $this->serviceDetails->migrationMode, - [MigrationMode::MIGRATING, MigrationMode::MIGRATION_MODE_UNSPECIFIED] - ) - ? ' See {@see ' . $this->serviceDetails->emptyClientType->getFullname() . '} for the stable implementation' - : '') - ), - PhpDoc::experimental(), + $this->serviceDetails->isGa() ? null : PhpDoc::experimental(), !$this->serviceDetails->isDeprecated ? null : PhpDoc::deprecated(ServiceDetails::DEPRECATED_MSG), $this->serviceDetails->streamingOnly ? null : $this->magicAsyncDocs(), )) diff --git a/tests/Integration/goldens/asset/src/V1/Gapic/AssetServiceGapicClient.php b/tests/Integration/goldens/asset/src/V1/Gapic/AssetServiceGapicClient.php index b1b37d058..384e5a5c0 100644 --- a/tests/Integration/goldens/asset/src/V1/Gapic/AssetServiceGapicClient.php +++ b/tests/Integration/goldens/asset/src/V1/Gapic/AssetServiceGapicClient.php @@ -87,6 +87,8 @@ * assist with these names, this class includes a format method for each type of * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. + * + * @deprecated This class will be removed in the next major version update. */ class AssetServiceGapicClient { diff --git a/tests/Integration/goldens/compute_small/src/V1/Gapic/AddressesGapicClient.php b/tests/Integration/goldens/compute_small/src/V1/Gapic/AddressesGapicClient.php index 4d7581ec8..811119eeb 100644 --- a/tests/Integration/goldens/compute_small/src/V1/Gapic/AddressesGapicClient.php +++ b/tests/Integration/goldens/compute_small/src/V1/Gapic/AddressesGapicClient.php @@ -73,6 +73,8 @@ * $addressesClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class AddressesGapicClient { diff --git a/tests/Integration/goldens/compute_small/src/V1/Gapic/RegionOperationsGapicClient.php b/tests/Integration/goldens/compute_small/src/V1/Gapic/RegionOperationsGapicClient.php index 7fa16e96e..c10f12246 100644 --- a/tests/Integration/goldens/compute_small/src/V1/Gapic/RegionOperationsGapicClient.php +++ b/tests/Integration/goldens/compute_small/src/V1/Gapic/RegionOperationsGapicClient.php @@ -52,6 +52,8 @@ * $regionOperationsClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class RegionOperationsGapicClient { diff --git a/tests/Integration/goldens/container/src/V1/Gapic/ClusterManagerGapicClient.php b/tests/Integration/goldens/container/src/V1/Gapic/ClusterManagerGapicClient.php index ab14bfce3..2cd130d8a 100644 --- a/tests/Integration/goldens/container/src/V1/Gapic/ClusterManagerGapicClient.php +++ b/tests/Integration/goldens/container/src/V1/Gapic/ClusterManagerGapicClient.php @@ -99,6 +99,8 @@ * $clusterManagerClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class ClusterManagerGapicClient { diff --git a/tests/Integration/goldens/dataproc/src/V1/Gapic/AutoscalingPolicyServiceGapicClient.php b/tests/Integration/goldens/dataproc/src/V1/Gapic/AutoscalingPolicyServiceGapicClient.php index c3ebaf91e..cb372439d 100644 --- a/tests/Integration/goldens/dataproc/src/V1/Gapic/AutoscalingPolicyServiceGapicClient.php +++ b/tests/Integration/goldens/dataproc/src/V1/Gapic/AutoscalingPolicyServiceGapicClient.php @@ -64,6 +64,8 @@ * assist with these names, this class includes a format method for each type of * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. + * + * @deprecated This class will be removed in the next major version update. */ class AutoscalingPolicyServiceGapicClient { diff --git a/tests/Integration/goldens/dataproc/src/V1/Gapic/ClusterControllerGapicClient.php b/tests/Integration/goldens/dataproc/src/V1/Gapic/ClusterControllerGapicClient.php index 9cf772758..b2c5c05da 100644 --- a/tests/Integration/goldens/dataproc/src/V1/Gapic/ClusterControllerGapicClient.php +++ b/tests/Integration/goldens/dataproc/src/V1/Gapic/ClusterControllerGapicClient.php @@ -99,6 +99,8 @@ * assist with these names, this class includes a format method for each type of * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. + * + * @deprecated This class will be removed in the next major version update. */ class ClusterControllerGapicClient { diff --git a/tests/Integration/goldens/dataproc/src/V1/Gapic/JobControllerGapicClient.php b/tests/Integration/goldens/dataproc/src/V1/Gapic/JobControllerGapicClient.php index b495f5165..68e529890 100644 --- a/tests/Integration/goldens/dataproc/src/V1/Gapic/JobControllerGapicClient.php +++ b/tests/Integration/goldens/dataproc/src/V1/Gapic/JobControllerGapicClient.php @@ -64,6 +64,8 @@ * $jobControllerClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class JobControllerGapicClient { diff --git a/tests/Integration/goldens/dataproc/src/V1/Gapic/WorkflowTemplateServiceGapicClient.php b/tests/Integration/goldens/dataproc/src/V1/Gapic/WorkflowTemplateServiceGapicClient.php index 355c13894..a644802ca 100644 --- a/tests/Integration/goldens/dataproc/src/V1/Gapic/WorkflowTemplateServiceGapicClient.php +++ b/tests/Integration/goldens/dataproc/src/V1/Gapic/WorkflowTemplateServiceGapicClient.php @@ -70,6 +70,8 @@ * assist with these names, this class includes a format method for each type of * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. + * + * @deprecated This class will be removed in the next major version update. */ class WorkflowTemplateServiceGapicClient { diff --git a/tests/Integration/goldens/functions/src/V1/Client/CloudFunctionsServiceClient.php b/tests/Integration/goldens/functions/src/V1/Client/CloudFunctionsServiceClient.php index 3acd97545..2c6eb2b95 100644 --- a/tests/Integration/goldens/functions/src/V1/Client/CloudFunctionsServiceClient.php +++ b/tests/Integration/goldens/functions/src/V1/Client/CloudFunctionsServiceClient.php @@ -66,10 +66,6 @@ * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. * - * This class is currently experimental and may be subject to changes. - * - * @experimental - * * @method PromiseInterface callFunctionAsync(CallFunctionRequest $request, array $optionalArgs = []) * @method PromiseInterface createFunctionAsync(CreateFunctionRequest $request, array $optionalArgs = []) * @method PromiseInterface deleteFunctionAsync(DeleteFunctionRequest $request, array $optionalArgs = []) diff --git a/tests/Integration/goldens/iam/src/V1/Gapic/IAMPolicyGapicClient.php b/tests/Integration/goldens/iam/src/V1/Gapic/IAMPolicyGapicClient.php index ef0d0fe27..d848dff6d 100644 --- a/tests/Integration/goldens/iam/src/V1/Gapic/IAMPolicyGapicClient.php +++ b/tests/Integration/goldens/iam/src/V1/Gapic/IAMPolicyGapicClient.php @@ -78,6 +78,8 @@ * $iAMPolicyClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class IAMPolicyGapicClient { diff --git a/tests/Integration/goldens/kms/src/V1/Gapic/KeyManagementServiceGapicClient.php b/tests/Integration/goldens/kms/src/V1/Gapic/KeyManagementServiceGapicClient.php index a9ec47114..d38f900ff 100644 --- a/tests/Integration/goldens/kms/src/V1/Gapic/KeyManagementServiceGapicClient.php +++ b/tests/Integration/goldens/kms/src/V1/Gapic/KeyManagementServiceGapicClient.php @@ -117,6 +117,8 @@ * assist with these names, this class includes a format method for each type of * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. + * + * @deprecated This class will be removed in the next major version update. */ class KeyManagementServiceGapicClient { diff --git a/tests/Integration/goldens/logging/src/V2/Gapic/ConfigServiceV2GapicClient.php b/tests/Integration/goldens/logging/src/V2/Gapic/ConfigServiceV2GapicClient.php index 8d2ff1f85..98307241d 100644 --- a/tests/Integration/goldens/logging/src/V2/Gapic/ConfigServiceV2GapicClient.php +++ b/tests/Integration/goldens/logging/src/V2/Gapic/ConfigServiceV2GapicClient.php @@ -90,6 +90,8 @@ * assist with these names, this class includes a format method for each type of * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. + * + * @deprecated This class will be removed in the next major version update. */ class ConfigServiceV2GapicClient { diff --git a/tests/Integration/goldens/logging/src/V2/Gapic/LoggingServiceV2GapicClient.php b/tests/Integration/goldens/logging/src/V2/Gapic/LoggingServiceV2GapicClient.php index 2b8eaebdc..e0ae7d532 100644 --- a/tests/Integration/goldens/logging/src/V2/Gapic/LoggingServiceV2GapicClient.php +++ b/tests/Integration/goldens/logging/src/V2/Gapic/LoggingServiceV2GapicClient.php @@ -69,6 +69,8 @@ * assist with these names, this class includes a format method for each type of * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. + * + * @deprecated This class will be removed in the next major version update. */ class LoggingServiceV2GapicClient { diff --git a/tests/Integration/goldens/logging/src/V2/Gapic/MetricsServiceV2GapicClient.php b/tests/Integration/goldens/logging/src/V2/Gapic/MetricsServiceV2GapicClient.php index 951f82e4d..cddfc71a5 100644 --- a/tests/Integration/goldens/logging/src/V2/Gapic/MetricsServiceV2GapicClient.php +++ b/tests/Integration/goldens/logging/src/V2/Gapic/MetricsServiceV2GapicClient.php @@ -63,6 +63,8 @@ * assist with these names, this class includes a format method for each type of * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. + * + * @deprecated This class will be removed in the next major version update. */ class MetricsServiceV2GapicClient { diff --git a/tests/Integration/goldens/redis/src/V1/Client/CloudRedisClient.php b/tests/Integration/goldens/redis/src/V1/Client/CloudRedisClient.php index dc5d58c8b..645856df6 100644 --- a/tests/Integration/goldens/redis/src/V1/Client/CloudRedisClient.php +++ b/tests/Integration/goldens/redis/src/V1/Client/CloudRedisClient.php @@ -73,11 +73,6 @@ * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. * - * This class is currently experimental and may be subject to changes. See {@see - * \Google\Cloud\Redis\V1\CloudRedisClient} for the stable implementation - * - * @experimental - * * @method PromiseInterface createInstanceAsync(CreateInstanceRequest $request, array $optionalArgs = []) * @method PromiseInterface deleteInstanceAsync(DeleteInstanceRequest $request, array $optionalArgs = []) * @method PromiseInterface exportInstanceAsync(ExportInstanceRequest $request, array $optionalArgs = []) diff --git a/tests/Integration/goldens/redis/src/V1/Gapic/CloudRedisGapicClient.php b/tests/Integration/goldens/redis/src/V1/Gapic/CloudRedisGapicClient.php index e9524f60c..4fe8f016f 100644 --- a/tests/Integration/goldens/redis/src/V1/Gapic/CloudRedisGapicClient.php +++ b/tests/Integration/goldens/redis/src/V1/Gapic/CloudRedisGapicClient.php @@ -113,8 +113,7 @@ * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. * - * This service has a new (beta) implementation. See {@see - * \Google\Cloud\Redis\V1\Client\CloudRedisClient} to use the new surface. + * @deprecated Please use the new service client {@see \Google\Cloud\Redis\V1\Client\CloudRedisClient}. */ class CloudRedisGapicClient { diff --git a/tests/Integration/goldens/retail/src/V2alpha/Gapic/CatalogServiceGapicClient.php b/tests/Integration/goldens/retail/src/V2alpha/Gapic/CatalogServiceGapicClient.php index ab8660a3d..92ac1251b 100644 --- a/tests/Integration/goldens/retail/src/V2alpha/Gapic/CatalogServiceGapicClient.php +++ b/tests/Integration/goldens/retail/src/V2alpha/Gapic/CatalogServiceGapicClient.php @@ -66,6 +66,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class CatalogServiceGapicClient { diff --git a/tests/Integration/goldens/retail/src/V2alpha/Gapic/CompletionServiceGapicClient.php b/tests/Integration/goldens/retail/src/V2alpha/Gapic/CompletionServiceGapicClient.php index d56051568..c7bb3aa3b 100644 --- a/tests/Integration/goldens/retail/src/V2alpha/Gapic/CompletionServiceGapicClient.php +++ b/tests/Integration/goldens/retail/src/V2alpha/Gapic/CompletionServiceGapicClient.php @@ -70,6 +70,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class CompletionServiceGapicClient { diff --git a/tests/Integration/goldens/retail/src/V2alpha/Gapic/PredictionServiceGapicClient.php b/tests/Integration/goldens/retail/src/V2alpha/Gapic/PredictionServiceGapicClient.php index c6bc82b9a..75906f224 100644 --- a/tests/Integration/goldens/retail/src/V2alpha/Gapic/PredictionServiceGapicClient.php +++ b/tests/Integration/goldens/retail/src/V2alpha/Gapic/PredictionServiceGapicClient.php @@ -62,6 +62,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class PredictionServiceGapicClient { diff --git a/tests/Integration/goldens/retail/src/V2alpha/Gapic/ProductServiceGapicClient.php b/tests/Integration/goldens/retail/src/V2alpha/Gapic/ProductServiceGapicClient.php index a69796788..41486179d 100644 --- a/tests/Integration/goldens/retail/src/V2alpha/Gapic/ProductServiceGapicClient.php +++ b/tests/Integration/goldens/retail/src/V2alpha/Gapic/ProductServiceGapicClient.php @@ -107,6 +107,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class ProductServiceGapicClient { diff --git a/tests/Integration/goldens/retail/src/V2alpha/Gapic/SearchServiceGapicClient.php b/tests/Integration/goldens/retail/src/V2alpha/Gapic/SearchServiceGapicClient.php index dd5fbb881..9e44d1bac 100644 --- a/tests/Integration/goldens/retail/src/V2alpha/Gapic/SearchServiceGapicClient.php +++ b/tests/Integration/goldens/retail/src/V2alpha/Gapic/SearchServiceGapicClient.php @@ -83,6 +83,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class SearchServiceGapicClient { diff --git a/tests/Integration/goldens/retail/src/V2alpha/Gapic/UserEventServiceGapicClient.php b/tests/Integration/goldens/retail/src/V2alpha/Gapic/UserEventServiceGapicClient.php index 1db9d5166..d02502541 100644 --- a/tests/Integration/goldens/retail/src/V2alpha/Gapic/UserEventServiceGapicClient.php +++ b/tests/Integration/goldens/retail/src/V2alpha/Gapic/UserEventServiceGapicClient.php @@ -72,6 +72,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class UserEventServiceGapicClient { diff --git a/tests/Integration/goldens/securitycenter/src/V1/Client/SecurityCenterClient.php b/tests/Integration/goldens/securitycenter/src/V1/Client/SecurityCenterClient.php index faa0789a3..27c8abc23 100644 --- a/tests/Integration/goldens/securitycenter/src/V1/Client/SecurityCenterClient.php +++ b/tests/Integration/goldens/securitycenter/src/V1/Client/SecurityCenterClient.php @@ -79,12 +79,6 @@ * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. * - * This class is currently experimental and may be subject to changes. See {@see - * \Google\Cloud\SecurityCenter\V1\SecurityCenterClient} for the stable - * implementation - * - * @experimental - * * @method PromiseInterface createFindingAsync(CreateFindingRequest $request, array $optionalArgs = []) * @method PromiseInterface createNotificationConfigAsync(CreateNotificationConfigRequest $request, array $optionalArgs = []) * @method PromiseInterface createSourceAsync(CreateSourceRequest $request, array $optionalArgs = []) diff --git a/tests/Integration/goldens/securitycenter/src/V1/Gapic/SecurityCenterGapicClient.php b/tests/Integration/goldens/securitycenter/src/V1/Gapic/SecurityCenterGapicClient.php index 4d5d310be..7a2e555cb 100644 --- a/tests/Integration/goldens/securitycenter/src/V1/Gapic/SecurityCenterGapicClient.php +++ b/tests/Integration/goldens/securitycenter/src/V1/Gapic/SecurityCenterGapicClient.php @@ -102,9 +102,7 @@ * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. * - * This service has a new (beta) implementation. See {@see - * \Google\Cloud\SecurityCenter\V1\Client\SecurityCenterClient} to use the new - * surface. + * @deprecated Please use the new service client {@see \Google\Cloud\SecurityCenter\V1\Client\SecurityCenterClient}. */ class SecurityCenterGapicClient { diff --git a/tests/Integration/goldens/speech/src/V1/Gapic/SpeechGapicClient.php b/tests/Integration/goldens/speech/src/V1/Gapic/SpeechGapicClient.php index ae6f25adf..004b4579f 100644 --- a/tests/Integration/goldens/speech/src/V1/Gapic/SpeechGapicClient.php +++ b/tests/Integration/goldens/speech/src/V1/Gapic/SpeechGapicClient.php @@ -86,6 +86,8 @@ * $speechClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class SpeechGapicClient { diff --git a/tests/Integration/goldens/talent/src/V4beta1/Gapic/ApplicationServiceGapicClient.php b/tests/Integration/goldens/talent/src/V4beta1/Gapic/ApplicationServiceGapicClient.php index 801000f0f..040821869 100644 --- a/tests/Integration/goldens/talent/src/V4beta1/Gapic/ApplicationServiceGapicClient.php +++ b/tests/Integration/goldens/talent/src/V4beta1/Gapic/ApplicationServiceGapicClient.php @@ -69,6 +69,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class ApplicationServiceGapicClient { diff --git a/tests/Integration/goldens/talent/src/V4beta1/Gapic/CompanyServiceGapicClient.php b/tests/Integration/goldens/talent/src/V4beta1/Gapic/CompanyServiceGapicClient.php index 522ccfd86..dd4e14ac9 100644 --- a/tests/Integration/goldens/talent/src/V4beta1/Gapic/CompanyServiceGapicClient.php +++ b/tests/Integration/goldens/talent/src/V4beta1/Gapic/CompanyServiceGapicClient.php @@ -68,6 +68,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class CompanyServiceGapicClient { diff --git a/tests/Integration/goldens/talent/src/V4beta1/Gapic/CompletionGapicClient.php b/tests/Integration/goldens/talent/src/V4beta1/Gapic/CompletionGapicClient.php index c6a6ecbf0..c2b6231da 100644 --- a/tests/Integration/goldens/talent/src/V4beta1/Gapic/CompletionGapicClient.php +++ b/tests/Integration/goldens/talent/src/V4beta1/Gapic/CompletionGapicClient.php @@ -64,6 +64,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class CompletionGapicClient { diff --git a/tests/Integration/goldens/talent/src/V4beta1/Gapic/EventServiceGapicClient.php b/tests/Integration/goldens/talent/src/V4beta1/Gapic/EventServiceGapicClient.php index 0e82b64a5..473befec7 100644 --- a/tests/Integration/goldens/talent/src/V4beta1/Gapic/EventServiceGapicClient.php +++ b/tests/Integration/goldens/talent/src/V4beta1/Gapic/EventServiceGapicClient.php @@ -61,6 +61,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class EventServiceGapicClient { diff --git a/tests/Integration/goldens/talent/src/V4beta1/Gapic/JobServiceGapicClient.php b/tests/Integration/goldens/talent/src/V4beta1/Gapic/JobServiceGapicClient.php index 6d095f6d8..ee82efc6a 100644 --- a/tests/Integration/goldens/talent/src/V4beta1/Gapic/JobServiceGapicClient.php +++ b/tests/Integration/goldens/talent/src/V4beta1/Gapic/JobServiceGapicClient.php @@ -109,6 +109,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class JobServiceGapicClient { diff --git a/tests/Integration/goldens/talent/src/V4beta1/Gapic/ProfileServiceGapicClient.php b/tests/Integration/goldens/talent/src/V4beta1/Gapic/ProfileServiceGapicClient.php index 111b49b85..933fa27de 100644 --- a/tests/Integration/goldens/talent/src/V4beta1/Gapic/ProfileServiceGapicClient.php +++ b/tests/Integration/goldens/talent/src/V4beta1/Gapic/ProfileServiceGapicClient.php @@ -74,6 +74,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class ProfileServiceGapicClient { diff --git a/tests/Integration/goldens/talent/src/V4beta1/Gapic/TenantServiceGapicClient.php b/tests/Integration/goldens/talent/src/V4beta1/Gapic/TenantServiceGapicClient.php index c24b03e7f..75128504b 100644 --- a/tests/Integration/goldens/talent/src/V4beta1/Gapic/TenantServiceGapicClient.php +++ b/tests/Integration/goldens/talent/src/V4beta1/Gapic/TenantServiceGapicClient.php @@ -68,6 +68,8 @@ * contained within formatted names that are returned by the API. * * @experimental + * + * @deprecated This class will be removed in the next major version update. */ class TenantServiceGapicClient { diff --git a/tests/Integration/goldens/videointelligence/src/V1/Gapic/VideoIntelligenceServiceGapicClient.php b/tests/Integration/goldens/videointelligence/src/V1/Gapic/VideoIntelligenceServiceGapicClient.php index d4c0630a9..145ef411f 100644 --- a/tests/Integration/goldens/videointelligence/src/V1/Gapic/VideoIntelligenceServiceGapicClient.php +++ b/tests/Integration/goldens/videointelligence/src/V1/Gapic/VideoIntelligenceServiceGapicClient.php @@ -79,6 +79,8 @@ * $videoIntelligenceServiceClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class VideoIntelligenceServiceGapicClient { diff --git a/tests/Tools/ConfigLoader.php b/tests/Tools/ConfigLoader.php index ec68791de..51ddaa045 100644 --- a/tests/Tools/ConfigLoader.php +++ b/tests/Tools/ConfigLoader.php @@ -18,7 +18,7 @@ namespace Google\Generator\Tests\Tools; -trait ConfigLoader +class ConfigLoader { /** * Load a config file from the specified path, which must be relative to the `tests/Unit` directory. diff --git a/tests/Unit/ProtoTests/Basic/out/src/Client/BasicClient.php b/tests/Unit/ProtoTests/Basic/out/src/Client/BasicClient.php index 3cab04cd0..9a3509d3c 100644 --- a/tests/Unit/ProtoTests/Basic/out/src/Client/BasicClient.php +++ b/tests/Unit/ProtoTests/Basic/out/src/Client/BasicClient.php @@ -42,10 +42,6 @@ * This class provides the ability to make remote calls to the backing service through method * calls that map to API methods. * - * This class is currently experimental and may be subject to changes. - * - * @experimental - * * @method PromiseInterface aMethodAsync(Request $request, array $optionalArgs = []) * @method PromiseInterface methodWithArgsAsync(RequestWithArgs $request, array $optionalArgs = []) */ diff --git a/tests/Unit/ProtoTests/BasicBidiStreaming/out/src/Gapic/BasicBidiStreamingGapicClient.php b/tests/Unit/ProtoTests/BasicBidiStreaming/out/src/Gapic/BasicBidiStreamingGapicClient.php index 21c8deecc..3b2e8f06c 100644 --- a/tests/Unit/ProtoTests/BasicBidiStreaming/out/src/Gapic/BasicBidiStreamingGapicClient.php +++ b/tests/Unit/ProtoTests/BasicBidiStreaming/out/src/Gapic/BasicBidiStreamingGapicClient.php @@ -81,6 +81,8 @@ * $basicBidiStreamingClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class BasicBidiStreamingGapicClient { diff --git a/tests/Unit/ProtoTests/BasicClientStreaming/out/src/Gapic/BasicClientStreamingGapicClient.php b/tests/Unit/ProtoTests/BasicClientStreaming/out/src/Gapic/BasicClientStreamingGapicClient.php index d1d1e1bf9..e71e33b93 100644 --- a/tests/Unit/ProtoTests/BasicClientStreaming/out/src/Gapic/BasicClientStreamingGapicClient.php +++ b/tests/Unit/ProtoTests/BasicClientStreaming/out/src/Gapic/BasicClientStreamingGapicClient.php @@ -69,6 +69,8 @@ * $basicClientStreamingClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class BasicClientStreamingGapicClient { diff --git a/tests/Unit/ProtoTests/BasicDiregapic/out/src/Gapic/LibraryGapicClient.php b/tests/Unit/ProtoTests/BasicDiregapic/out/src/Gapic/LibraryGapicClient.php index 1387446b7..3115c8343 100644 --- a/tests/Unit/ProtoTests/BasicDiregapic/out/src/Gapic/LibraryGapicClient.php +++ b/tests/Unit/ProtoTests/BasicDiregapic/out/src/Gapic/LibraryGapicClient.php @@ -134,6 +134,8 @@ * assist with these names, this class includes a format method for each type of * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. + * + * @deprecated This class will be removed in the next major version update. */ class LibraryGapicClient { diff --git a/tests/Unit/ProtoTests/BasicLro/out/src/Gapic/BasicLroGapicClient.php b/tests/Unit/ProtoTests/BasicLro/out/src/Gapic/BasicLroGapicClient.php index 0c4b2ca51..32d454bc5 100644 --- a/tests/Unit/ProtoTests/BasicLro/out/src/Gapic/BasicLroGapicClient.php +++ b/tests/Unit/ProtoTests/BasicLro/out/src/Gapic/BasicLroGapicClient.php @@ -75,6 +75,8 @@ * $basicLroClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class BasicLroGapicClient { diff --git a/tests/Unit/ProtoTests/BasicOneof/out/src/Gapic/BasicOneofGapicClient.php b/tests/Unit/ProtoTests/BasicOneof/out/src/Gapic/BasicOneofGapicClient.php index 75f64ea5b..d084e26bc 100644 --- a/tests/Unit/ProtoTests/BasicOneof/out/src/Gapic/BasicOneofGapicClient.php +++ b/tests/Unit/ProtoTests/BasicOneof/out/src/Gapic/BasicOneofGapicClient.php @@ -54,6 +54,8 @@ * $basicOneofClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class BasicOneofGapicClient { diff --git a/tests/Unit/ProtoTests/BasicOneofNew/out/src/Client/BasicOneofNewClient.php b/tests/Unit/ProtoTests/BasicOneofNew/out/src/Client/BasicOneofNewClient.php index 595abaf5e..7fac9713c 100644 --- a/tests/Unit/ProtoTests/BasicOneofNew/out/src/Client/BasicOneofNewClient.php +++ b/tests/Unit/ProtoTests/BasicOneofNew/out/src/Client/BasicOneofNewClient.php @@ -41,10 +41,6 @@ * This class provides the ability to make remote calls to the backing service through method * calls that map to API methods. * - * This class is currently experimental and may be subject to changes. - * - * @experimental - * * @method PromiseInterface aMethodAsync(Request $request, array $optionalArgs = []) */ final class BasicOneofNewClient diff --git a/tests/Unit/ProtoTests/BasicPaginated/out/src/Gapic/BasicPaginatedGapicClient.php b/tests/Unit/ProtoTests/BasicPaginated/out/src/Gapic/BasicPaginatedGapicClient.php index f3e2c5ea7..2d7452861 100644 --- a/tests/Unit/ProtoTests/BasicPaginated/out/src/Gapic/BasicPaginatedGapicClient.php +++ b/tests/Unit/ProtoTests/BasicPaginated/out/src/Gapic/BasicPaginatedGapicClient.php @@ -66,6 +66,8 @@ * $basicPaginatedClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class BasicPaginatedGapicClient { diff --git a/tests/Unit/ProtoTests/BasicServerStreaming/out/src/Gapic/BasicServerStreamingGapicClient.php b/tests/Unit/ProtoTests/BasicServerStreaming/out/src/Gapic/BasicServerStreamingGapicClient.php index f292a4e3e..02c1cc0ec 100644 --- a/tests/Unit/ProtoTests/BasicServerStreaming/out/src/Gapic/BasicServerStreamingGapicClient.php +++ b/tests/Unit/ProtoTests/BasicServerStreaming/out/src/Gapic/BasicServerStreamingGapicClient.php @@ -53,6 +53,8 @@ * $basicServerStreamingClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class BasicServerStreamingGapicClient { diff --git a/tests/Unit/ProtoTests/CustomLro/out/src/Gapic/CustomLroGapicClient.php b/tests/Unit/ProtoTests/CustomLro/out/src/Gapic/CustomLroGapicClient.php index 2109d2107..62f3420d0 100644 --- a/tests/Unit/ProtoTests/CustomLro/out/src/Gapic/CustomLroGapicClient.php +++ b/tests/Unit/ProtoTests/CustomLro/out/src/Gapic/CustomLroGapicClient.php @@ -75,6 +75,8 @@ * $customLroClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class CustomLroGapicClient { diff --git a/tests/Unit/ProtoTests/CustomLro/out/src/Gapic/CustomLroOperationsGapicClient.php b/tests/Unit/ProtoTests/CustomLro/out/src/Gapic/CustomLroOperationsGapicClient.php index bef9c556c..a0ef88aaf 100644 --- a/tests/Unit/ProtoTests/CustomLro/out/src/Gapic/CustomLroOperationsGapicClient.php +++ b/tests/Unit/ProtoTests/CustomLro/out/src/Gapic/CustomLroOperationsGapicClient.php @@ -52,6 +52,8 @@ * $customLroOperationsClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class CustomLroOperationsGapicClient { diff --git a/tests/Unit/ProtoTests/DisableSnippets/out/src/Gapic/DisableSnippetsGapicClient.php b/tests/Unit/ProtoTests/DisableSnippets/out/src/Gapic/DisableSnippetsGapicClient.php index c34dc174d..c1edf9dce 100644 --- a/tests/Unit/ProtoTests/DisableSnippets/out/src/Gapic/DisableSnippetsGapicClient.php +++ b/tests/Unit/ProtoTests/DisableSnippets/out/src/Gapic/DisableSnippetsGapicClient.php @@ -49,6 +49,8 @@ * $disableSnippetsClient->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class DisableSnippetsGapicClient { diff --git a/tests/Unit/ProtoTests/GrpcServiceConfig/out/src/Gapic/GrpcServiceConfigWithRetry1GapicClient.php b/tests/Unit/ProtoTests/GrpcServiceConfig/out/src/Gapic/GrpcServiceConfigWithRetry1GapicClient.php index 639adcfa5..5bbea2209 100644 --- a/tests/Unit/ProtoTests/GrpcServiceConfig/out/src/Gapic/GrpcServiceConfigWithRetry1GapicClient.php +++ b/tests/Unit/ProtoTests/GrpcServiceConfig/out/src/Gapic/GrpcServiceConfigWithRetry1GapicClient.php @@ -52,6 +52,8 @@ * $grpcServiceConfigWithRetry1Client->close(); * } * ``` + * + * @deprecated This class will be removed in the next major version update. */ class GrpcServiceConfigWithRetry1GapicClient { diff --git a/tests/Unit/ProtoTests/ResourceNames/out/src/Client/ResourceNamesClient.php b/tests/Unit/ProtoTests/ResourceNames/out/src/Client/ResourceNamesClient.php index 07c3354c2..20f4c717d 100644 --- a/tests/Unit/ProtoTests/ResourceNames/out/src/Client/ResourceNamesClient.php +++ b/tests/Unit/ProtoTests/ResourceNames/out/src/Client/ResourceNamesClient.php @@ -55,11 +55,6 @@ * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. * - * This class is currently experimental and may be subject to changes. See {@see - * \Testing\ResourceNames\ResourceNamesClient} for the stable implementation - * - * @experimental - * * @method PromiseInterface fileLevelChildTypeRefMethodAsync(FileLevelChildTypeRefRequest $request, array $optionalArgs = []) * @method PromiseInterface fileLevelTypeRefMethodAsync(FileLevelTypeRefRequest $request, array $optionalArgs = []) * @method PromiseInterface multiPatternMethodAsync(MultiPatternRequest $request, array $optionalArgs = []) diff --git a/tests/Unit/ProtoTests/ResourceNames/out/src/Gapic/ResourceNamesGapicClient.php b/tests/Unit/ProtoTests/ResourceNames/out/src/Gapic/ResourceNamesGapicClient.php index 9b44c7df3..20fc4776e 100644 --- a/tests/Unit/ProtoTests/ResourceNames/out/src/Gapic/ResourceNamesGapicClient.php +++ b/tests/Unit/ProtoTests/ResourceNames/out/src/Gapic/ResourceNamesGapicClient.php @@ -70,8 +70,7 @@ * name, and additionally a parseName method to extract the individual identifiers * contained within formatted names that are returned by the API. * - * This service has a new (beta) implementation. See {@see - * \Testing\ResourceNames\Client\ResourceNamesClient} to use the new surface. + * @deprecated Please use the new service client {@see \Testing\ResourceNames\Client\ResourceNamesClient}. */ class ResourceNamesGapicClient { diff --git a/tests/Unit/ProtoTests/RoutingHeaders/out/src/Client/RoutingHeadersClient.php b/tests/Unit/ProtoTests/RoutingHeaders/out/src/Client/RoutingHeadersClient.php index 050067562..b42318393 100644 --- a/tests/Unit/ProtoTests/RoutingHeaders/out/src/Client/RoutingHeadersClient.php +++ b/tests/Unit/ProtoTests/RoutingHeaders/out/src/Client/RoutingHeadersClient.php @@ -43,11 +43,6 @@ * This class provides the ability to make remote calls to the backing service through method * calls that map to API methods. * - * This class is currently experimental and may be subject to changes. See {@see - * \Testing\RoutingHeaders\RoutingHeadersClient} for the stable implementation - * - * @experimental - * * @method PromiseInterface deleteMethodAsync(SimpleRequest $request, array $optionalArgs = []) * @method PromiseInterface getMethodAsync(SimpleRequest $request, array $optionalArgs = []) * @method PromiseInterface getNoPlaceholdersMethodAsync(SimpleRequest $request, array $optionalArgs = []) diff --git a/tests/Unit/ProtoTests/RoutingHeaders/out/src/Gapic/RoutingHeadersGapicClient.php b/tests/Unit/ProtoTests/RoutingHeaders/out/src/Gapic/RoutingHeadersGapicClient.php index e48b73b9e..791c07ed0 100644 --- a/tests/Unit/ProtoTests/RoutingHeaders/out/src/Gapic/RoutingHeadersGapicClient.php +++ b/tests/Unit/ProtoTests/RoutingHeaders/out/src/Gapic/RoutingHeadersGapicClient.php @@ -53,8 +53,7 @@ * } * ``` * - * This service has a new (beta) implementation. See {@see - * \Testing\RoutingHeaders\Client\RoutingHeadersClient} to use the new surface. + * @deprecated Please use the new service client {@see \Testing\RoutingHeaders\Client\RoutingHeadersClient}. */ class RoutingHeadersGapicClient {