From d58a548abc68cafdf990e6383b0e481c61b31dc5 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Sat, 25 Jun 2022 16:32:55 +0800
Subject: [PATCH] Apply remaining gRPC API changes

---
 .../GrpcJsonTranscodingServiceExtensions.cs   | 24 +++++++++----------
 .../PublicAPI.Unshipped.txt                   |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonTranscodingServiceExtensions.cs b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonTranscodingServiceExtensions.cs
index 98934e635564..817bd9aedac7 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonTranscodingServiceExtensions.cs
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonTranscodingServiceExtensions.cs
@@ -17,34 +17,34 @@ public static class GrpcJsonTranscodingServiceExtensions
     /// <summary>
     /// Adds gRPC JSON transcoding services to the specified <see cref="IGrpcServerBuilder" />.
     /// </summary>
-    /// <param name="grpcBuilder">The <see cref="IGrpcServerBuilder"/>.</param>
+    /// <param name="builder">The <see cref="IGrpcServerBuilder"/>.</param>
     /// <returns>The same instance of the <see cref="IGrpcServerBuilder"/> for chaining.</returns>
-    public static IGrpcServerBuilder AddJsonTranscoding(this IGrpcServerBuilder grpcBuilder)
+    public static IGrpcServerBuilder AddJsonTranscoding(this IGrpcServerBuilder builder)
     {
-        if (grpcBuilder == null)
+        if (builder == null)
         {
-            throw new ArgumentNullException(nameof(grpcBuilder));
+            throw new ArgumentNullException(nameof(builder));
         }
 
-        grpcBuilder.Services.TryAddEnumerable(ServiceDescriptor.Singleton(typeof(IServiceMethodProvider<>), typeof(JsonTranscodingServiceMethodProvider<>)));
+        builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton(typeof(IServiceMethodProvider<>), typeof(JsonTranscodingServiceMethodProvider<>)));
 
-        return grpcBuilder;
+        return builder;
     }
 
     /// <summary>
     /// Adds gRPC JSON transcoding services to the specified <see cref="IGrpcServerBuilder" />.
     /// </summary>
-    /// <param name="grpcBuilder">The <see cref="IGrpcServerBuilder"/>.</param>
+    /// <param name="builder">The <see cref="IGrpcServerBuilder"/>.</param>
     /// <param name="configureOptions">An <see cref="Action{GrpcJsonTranscodingOptions}"/> to configure the provided <see cref="GrpcJsonTranscodingOptions"/>.</param>
     /// <returns>The same instance of the <see cref="IGrpcServerBuilder"/> for chaining.</returns>
-    public static IGrpcServerBuilder AddJsonTranscoding(this IGrpcServerBuilder grpcBuilder, Action<GrpcJsonTranscodingOptions> configureOptions)
+    public static IGrpcServerBuilder AddJsonTranscoding(this IGrpcServerBuilder builder, Action<GrpcJsonTranscodingOptions> configureOptions)
     {
-        if (grpcBuilder == null)
+        if (builder == null)
         {
-            throw new ArgumentNullException(nameof(grpcBuilder));
+            throw new ArgumentNullException(nameof(builder));
         }
 
-        grpcBuilder.Services.Configure(configureOptions);
-        return grpcBuilder.AddJsonTranscoding();
+        builder.Services.Configure(configureOptions);
+        return builder.AddJsonTranscoding();
     }
 }
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/PublicAPI.Unshipped.txt b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/PublicAPI.Unshipped.txt
index 6ec9d5a61a6e..d448a37e8e64 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/PublicAPI.Unshipped.txt
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/PublicAPI.Unshipped.txt
@@ -20,5 +20,5 @@ Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonTranscodingOptions.JsonSetting
 Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonTranscodingOptions.TypeRegistry.get -> Google.Protobuf.Reflection.TypeRegistry!
 Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonTranscodingOptions.TypeRegistry.set -> void
 Microsoft.Extensions.DependencyInjection.GrpcJsonTranscodingServiceExtensions
-static Microsoft.Extensions.DependencyInjection.GrpcJsonTranscodingServiceExtensions.AddJsonTranscoding(this Grpc.AspNetCore.Server.IGrpcServerBuilder! grpcBuilder) -> Grpc.AspNetCore.Server.IGrpcServerBuilder!
-static Microsoft.Extensions.DependencyInjection.GrpcJsonTranscodingServiceExtensions.AddJsonTranscoding(this Grpc.AspNetCore.Server.IGrpcServerBuilder! grpcBuilder, System.Action<Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonTranscodingOptions!>! configureOptions) -> Grpc.AspNetCore.Server.IGrpcServerBuilder!
+static Microsoft.Extensions.DependencyInjection.GrpcJsonTranscodingServiceExtensions.AddJsonTranscoding(this Grpc.AspNetCore.Server.IGrpcServerBuilder! builder) -> Grpc.AspNetCore.Server.IGrpcServerBuilder!
+static Microsoft.Extensions.DependencyInjection.GrpcJsonTranscodingServiceExtensions.AddJsonTranscoding(this Grpc.AspNetCore.Server.IGrpcServerBuilder! builder, System.Action<Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonTranscodingOptions!>! configureOptions) -> Grpc.AspNetCore.Server.IGrpcServerBuilder!