Refactored JsonServicesMiddlewareExtensions, added JsonServicesConfig helper.

Author: yallie

sample/sample-core-server/JsonServicesConfig.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using JsonServices.Serialization;
+using JsonServices.Services;
+using JsonServices.Transport;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace JsonServices.Sample.CoreServer
+{
+	using Serializer = Serialization.ServiceStack.Serializer;
+	using ServiceExecutor = Tests.Services.StubExecutor;
+	using MessageTypeProvider = Tests.Services.StubMessageTypeProvider;
+
+	public class JsonServicesConfig
+	{
+		public JsonServicesConfig(IServiceCollection services)
+		{
+			Services = services;
+		}
+
+		private IServiceCollection Services { get; }
+
+		private bool NeedsSerializer { get; set; } = true;
+
+		private bool NeedsServiceExecutor { get; set; } = true;
+
+		private bool NeedsMessageTypeProvider { get; set; } = true;
+
+		public IServiceCollection GetServices()
+		{
+			Services.AddSingleton<IServer, JsonServicesConnectionManager>();
+			Services.AddSingleton<JsonServer>();
+
+			if (NeedsSerializer)
+			{
+				AddSerializer<Serializer>();
+			}
+
+			if (NeedsServiceExecutor)
+			{
+				AddServiceExecutor<ServiceExecutor>();
+			}
+
+			if (NeedsMessageTypeProvider)
+			{
+				AddTypeProvider<MessageTypeProvider>();
+			}
+
+			return Services;
+		}
+
+		public JsonServicesConfig AddSerializer<TSerializer>()
+			where TSerializer : class, ISerializer
+		{
+			NeedsSerializer = false;
+			Services.AddSingleton<ISerializer, TSerializer>();
+			return this;
+		}
+
+		public JsonServicesConfig AddServiceExecutor<TServiceExecutor>()
+			where TServiceExecutor : class, IServiceExecutor
+		{
+			NeedsServiceExecutor = false;
+			Services.AddSingleton<IServiceExecutor, ServiceExecutor>();
+			return this;
+		}
+
+		public JsonServicesConfig AddTypeProvider<TMessageTypeProvider>()
+			where TMessageTypeProvider : class, IMessageTypeProvider
+		{
+			NeedsMessageTypeProvider = false;
+			Services.AddSingleton<IMessageTypeProvider, TMessageTypeProvider>();
+			return this;
+		}
+	}
+}

sample/sample-core-server/JsonServicesConnectionManager.cs

@@ -42,7 +42,7 @@ public async Task HandleIncomingMessages(WebSocket webSocket)
 				ConnectionId = connection.ConnectionId,
 			});
 
-			// 2. TODO: handle incoming messages in a loop until the socket is closed
+			// 2. handle incoming messages in a loop until the socket is closed
 			await ReceiveMessages(connection);
 
 			// 3. disconnect the client

sample/sample-core-server/JsonServicesMiddlewareExtensions.cs

@@ -1,10 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using JsonServices.Serialization;
-using JsonServices.Services;
-using JsonServices.Transport;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -15,17 +9,12 @@ public static class JsonServicesMiddlewareExtensions
 		public static IApplicationBuilder UseJsonServices(this IApplicationBuilder builder) =>
 			builder.UseMiddleware<JsonServicesMiddleware>();
 
-		public static IServiceCollection AddJsonServices<TSerializer, TServiceExecutor, TMessageTypeProvider>(this IServiceCollection services)
-			where TSerializer : class, ISerializer
-			where TServiceExecutor : class, IServiceExecutor
-			where TMessageTypeProvider : class, IMessageTypeProvider
+		public static IServiceCollection AddJsonServices(this IServiceCollection services,
+			Func<JsonServicesConfig, JsonServicesConfig> configFunction = null)
 		{
-			services.AddSingleton<ISerializer, TSerializer>();
-			services.AddSingleton<IServiceExecutor, TServiceExecutor>();
-			services.AddSingleton<IMessageTypeProvider, TMessageTypeProvider>();
-			services.AddSingleton<IServer, JsonServicesConnectionManager>();
-			services.AddSingleton<JsonServer>();
-			return services;
+			var config = new JsonServicesConfig(services);
+			configFunction?.Invoke(config);
+			return config.GetServices();
 		}
 	}
 }

sample/sample-core-server/Startup.cs

@@ -9,18 +9,14 @@
 
 namespace JsonServices.Sample.CoreServer
 {
-	using Serializer = Serialization.ServiceStack.Serializer;
-	using Executor = Tests.Services.StubExecutor;
-	using TypeProvider = Tests.Services.StubMessageTypeProvider;
-
 	public class Startup
 	{
 		// This method gets called by the runtime. Use this method to add services to the container.
 		// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
 		public void ConfigureServices(IServiceCollection services)
 		{
-			// initialize JsonServices classes
-			services.AddJsonServices<Serializer, Executor, TypeProvider>();
+			// setup JsonServices infrastructure services
+			services.AddJsonServices();
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.