Update

examples/GreeterByServiceDefinition/Server/Program.cs → examples/Definer/Server/Program.cs

@@ -17,20 +17,19 @@
 #endregion
 
 using Grpc.Core;
-using Server;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Server;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddGrpc();
 
 var app = builder.Build();
-app.MapGrpcService(getGreeterService);
-
-app.Run();
-
-static ServerServiceDefinition getGreeterService(IServiceProvider serviceProvider)
+app.MapGrpcService(services =>
 {
-    var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
+    var loggerFactory = services.GetRequiredService<ILoggerFactory>();
     var service = new GreeterService(loggerFactory);
     return Greet.Greeter.BindService(service);
-}
+});
+
+app.Run();

examples/Definer/Server/Properties/launchSettings.json

@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Server": {
+      "commandName": "Project",
+      "launchBrowser": false,
+      "applicationUrl": "https://localhost:5001",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

examples/README.md

@@ -330,7 +330,7 @@ The error example shows how to use a richer error model with `Grpc.StatusProto`.
 * [`google.rpc.Status`](https://cloud.google.com/apis/design/errors#error_model)
 
 
-## [GreeterByServiceDefinition](./GreeterByServiceDefinition)
+## [Definer](./Definer)
 
 This sample is similar with [Greeter](#greeter), but its service instance for server is mapped by using `ServerServiceDefinition`.
 

src/Grpc.AspNetCore.Server/GrpcEndpointRouteBuilderExtensions.cs

@@ -71,19 +71,16 @@ public static GrpcServiceEndpointConventionBuilder MapGrpcService(this IEndpoint
     /// Maps incoming requests to the <see cref="ServerServiceDefinition"/> instance from the specified factory.
     /// </summary>
     /// <param name="builder">The <see cref="IEndpointRouteBuilder"/> to add the route to.</param>
-    /// <param name="getServiceDefinition">The factory for <see cref="ServerServiceDefinition"/> instance.</param>
+    /// <param name="mapDefinition">The factory for <see cref="ServerServiceDefinition"/> instance.</param>
     /// <returns>A <see cref="GrpcServiceEndpointConventionBuilder"/> for endpoints associated with the service.</returns>
-    public static GrpcServiceEndpointConventionBuilder MapGrpcService(this IEndpointRouteBuilder builder, Func<IServiceProvider, ServerServiceDefinition> getServiceDefinition)
+    public static GrpcServiceEndpointConventionBuilder MapGrpcService(this IEndpointRouteBuilder builder, Func<IServiceProvider, ServerServiceDefinition> mapDefinition)
     {
         ArgumentNullException.ThrowIfNull(builder, nameof(builder));
-        ArgumentNullException.ThrowIfNull(getServiceDefinition, nameof(getServiceDefinition));
+        ArgumentNullException.ThrowIfNull(mapDefinition, nameof(mapDefinition));
 
-        var serviceDefinition = getServiceDefinition(builder.ServiceProvider);
+        var serviceDefinition = mapDefinition(builder.ServiceProvider);
 
-        var serviceRouteBuilder = builder.ServiceProvider.GetRequiredService<ServiceRouteBuilder<ServerServiceDefinitionMarker>>();
-        var endpointConventionBuilders = serviceRouteBuilder.Build(builder, serviceDefinition);
-
-        return new GrpcServiceEndpointConventionBuilder(endpointConventionBuilders);
+        return MapGrpcService(builder, serviceDefinition);
     }
 
     private static void ValidateServicesRegistered(IServiceProvider serviceProvider)