xDS: remove deprecated C++ APIs in the experimental namespace (#31451)

examples/cpp/helloworld/xds_greeter_client.cc

@@ -80,10 +80,10 @@ class GreeterClient {
 int main(int argc, char** argv) {
   absl::ParseCommandLine(argc, argv);
   GreeterClient greeter(grpc::CreateChannel(
-      absl::GetFlag(FLAGS_target), absl::GetFlag(FLAGS_secure)
-                                       ? grpc::experimental::XdsCredentials(
-                                             grpc::InsecureChannelCredentials())
-                                       : grpc::InsecureChannelCredentials()));
+      absl::GetFlag(FLAGS_target),
+      absl::GetFlag(FLAGS_secure)
+          ? grpc::XdsCredentials(grpc::InsecureChannelCredentials())
+          : grpc::InsecureChannelCredentials()));
   std::string user("world");
   std::string reply = greeter.SayHello(user);
   std::cout << "Greeter received: " << reply << std::endl;

examples/cpp/helloworld/xds_greeter_server.cc

@@ -64,7 +64,7 @@ void RunServer() {
   grpc::reflection::InitProtoReflectionServerBuilderPlugin();
   int port = absl::GetFlag(FLAGS_port);
   int maintenance_port = absl::GetFlag(FLAGS_maintenance_port);
-  grpc::experimental::XdsServerBuilder xds_builder;
+  grpc::XdsServerBuilder xds_builder;
   ServerBuilder builder;
   std::unique_ptr<Server> xds_enabled_server;
   std::unique_ptr<Server> server;
@@ -75,9 +75,9 @@ void RunServer() {
   if (absl::GetFlag(FLAGS_secure)) {
     // Listen on the given address with XdsServerCredentials and a fallback of
     // InsecureServerCredentials
-    xds_builder.AddListeningPort(absl::StrCat("0.0.0.0:", port),
-                                 grpc::experimental::XdsServerCredentials(
-                                     grpc::InsecureServerCredentials()));
+    xds_builder.AddListeningPort(
+        absl::StrCat("0.0.0.0:", port),
+        grpc::XdsServerCredentials(grpc::InsecureServerCredentials()));
     xds_enabled_server = xds_builder.BuildAndStart();
     gpr_log(GPR_INFO, "Server starting on 0.0.0.0:%d", port);
     grpc::AddAdminServices(&builder);

include/grpcpp/security/credentials.h

@@ -54,12 +54,6 @@ std::shared_ptr<grpc::Channel> CreateCustomChannelWithInterceptors(
     std::vector<
         std::unique_ptr<grpc::experimental::ClientInterceptorFactoryInterface>>
         interceptor_creators);
-
-GRPC_DEPRECATED(
-    "Use grpc::XdsCredentials instead. The experimental version will be "
-    "deleted after the 1.41 release.")
-std::shared_ptr<ChannelCredentials> XdsCredentials(
-    const std::shared_ptr<ChannelCredentials>& fallback_creds);
 }  // namespace experimental
 
 /// Builds XDS Credentials.

include/grpcpp/security/server_credentials.h

@@ -64,14 +64,6 @@ struct SslServerCredentialsOptions {
 std::shared_ptr<ServerCredentials> XdsServerCredentials(
     const std::shared_ptr<ServerCredentials>& fallback_credentials);
 
-namespace experimental {
-GRPC_DEPRECATED(
-    "Use grpc::XdsServerCredentials instead. The experimental version will be "
-    "deleted after the 1.41 release.")
-std::shared_ptr<ServerCredentials> XdsServerCredentials(
-    const std::shared_ptr<ServerCredentials>& fallback_credentials);
-}  // namespace experimental
-
 /// Wrapper around \a grpc_server_credentials, a way to authenticate a server.
 class ServerCredentials : private grpc::GrpcLibraryCodegen {
  public:

include/grpcpp/xds_server_builder.h

@@ -106,18 +106,6 @@ class XdsServerBuilder : public grpc::ServerBuilder {
   int drain_grace_time_ms_ = -1;
 };
 
-namespace experimental {
-// TODO(yashykt): Delete this after the 1.42 release.
-GRPC_DEPRECATED(
-    "Use grpc::XdsServerServingStatusNotifierInterface instead. The "
-    "experimental version will be deleted after the 1.42 release.")
-typedef grpc::XdsServerServingStatusNotifierInterface
-    XdsServerServingStatusNotifierInterface;
-GRPC_DEPRECATED(
-    "Use grpc::XdsServerBuilder instead. The experimental version will be "
-    "deleted after the 1.42 release.")
-typedef grpc::XdsServerBuilder XdsServerBuilder;
-}  // namespace experimental
 }  // namespace grpc
 
 #endif /* GRPCPP_XDS_SERVER_BUILDER_H */

test/cpp/end2end/xds/xds_end2end_test_lib.h

@@ -208,7 +208,7 @@ class XdsEnd2endTest : public ::testing::TestWithParam<XdsTestType> {
    public:
     // A status notifier for xDS-enabled servers.
     class XdsServingStatusNotifier
-        : public grpc::experimental::XdsServerServingStatusNotifierInterface {
+        : public grpc::XdsServerServingStatusNotifierInterface {
      public:
       void OnServingStatusUpdate(std::string uri,
                                  ServingStatusUpdate update) override;

test/cpp/interop/xds_interop_client.cc

@@ -469,12 +469,12 @@ void RunTestLoop(std::chrono::duration<double> duration_per_query,
   grpc::ChannelArguments channel_args;
   channel_args.SetInt(GRPC_ARG_ENABLE_RETRIES, 1);
   TestClient client(
-      grpc::CreateCustomChannel(absl::GetFlag(FLAGS_server),
-                                absl::GetFlag(FLAGS_secure_mode)
-                                    ? grpc::experimental::XdsCredentials(
-                                          grpc::InsecureChannelCredentials())
-                                    : grpc::InsecureChannelCredentials(),
-                                channel_args),
+      grpc::CreateCustomChannel(
+          absl::GetFlag(FLAGS_server),
+          absl::GetFlag(FLAGS_secure_mode)
+              ? grpc::XdsCredentials(grpc::InsecureChannelCredentials())
+              : grpc::InsecureChannelCredentials(),
+          channel_args),
       stats_watchers);
   std::chrono::time_point<std::chrono::system_clock> start =
       std::chrono::system_clock::now();