Refactored JsonServicesConfig class.

Author: yallie

sample/sample-core-server/JsonServicesConfig.cs

@@ -18,59 +18,46 @@ 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>();
-			}
+			// default service implementations
+			AddSerializer<Serializer>();
+			AddServiceExecutor<ServiceExecutor>();
+			AddTypeProvider<MessageTypeProvider>();
+		}
 
-			if (NeedsServiceExecutor)
-			{
-				AddServiceExecutor<ServiceExecutor>();
-			}
+		public IServiceCollection Services { get; }
 
-			if (NeedsMessageTypeProvider)
+		private void RemoveRegistration<IService>()
+		{
+			var descriptor = Services.FirstOrDefault(d => d.ServiceType == typeof(IService));
+			if (descriptor != null)
 			{
-				AddTypeProvider<MessageTypeProvider>();
+				Services.Remove(descriptor);
 			}
-
-			return Services;
 		}
 
 		public JsonServicesConfig AddSerializer<TSerializer>()
 			where TSerializer : class, ISerializer
 		{
-			NeedsSerializer = false;
+			RemoveRegistration<ISerializer>();
 			Services.AddSingleton<ISerializer, TSerializer>();
 			return this;
 		}
 
 		public JsonServicesConfig AddServiceExecutor<TServiceExecutor>()
 			where TServiceExecutor : class, IServiceExecutor
 		{
-			NeedsServiceExecutor = false;
+			RemoveRegistration<ISerializer>();
 			Services.AddSingleton<IServiceExecutor, ServiceExecutor>();
 			return this;
 		}
 
 		public JsonServicesConfig AddTypeProvider<TMessageTypeProvider>()
 			where TMessageTypeProvider : class, IMessageTypeProvider
 		{
-			NeedsMessageTypeProvider = false;
+			RemoveRegistration<ISerializer>();
 			Services.AddSingleton<IMessageTypeProvider, TMessageTypeProvider>();
 			return this;
 		}

sample/sample-core-server/JsonServicesMiddlewareExtensions.cs

@@ -6,15 +6,30 @@ namespace JsonServices.Sample.CoreServer
 {
 	public static class JsonServicesMiddlewareExtensions
 	{
-		public static IApplicationBuilder UseJsonServices(this IApplicationBuilder builder) =>
-			builder.UseMiddleware<JsonServicesMiddleware>();
-
+		/// <summary>
+		/// Adds services requires for JsonServices.
+		/// </summary>
+		/// <remarks>
+		/// This method should be called from Startup.ConfigureServices method.
+		/// </remarks>
+		/// <param name="services"><see cref="IServiceCollection"/> instance.</param>
+		/// <param name="configFunction">Additional configuration callback.</param>
 		public static IServiceCollection AddJsonServices(this IServiceCollection services,
 			Func<JsonServicesConfig, JsonServicesConfig> configFunction = null)
 		{
 			var config = new JsonServicesConfig(services);
 			configFunction?.Invoke(config);
-			return config.GetServices();
+			return config.Services;
 		}
+
+		/// <summary>
+		/// Initializes JsonServices request pipeline handler.
+		/// </summary>
+		/// <remarks>
+		/// This method should by called from Startup.Configure method.
+		/// </remarks>
+		/// <param name="builder">Application builder.</param>
+		public static IApplicationBuilder UseJsonServices(this IApplicationBuilder builder) =>
+			builder.UseMiddleware<JsonServicesMiddleware>();
 	}
 }

sample/sample-core-server/Properties/launchSettings.json

@@ -18,7 +18,7 @@
     "JsonServices.Sample.Server": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "applicationUrl": "https://localhost:8766;http://localhost:8765",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

sample/sample-core-server/Startup.cs

@@ -9,14 +9,18 @@
 
 namespace JsonServices.Sample.CoreServer
 {
+	using Serializer = Serialization.ServiceStack.Serializer;
+
 	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)
 		{
 			// setup JsonServices infrastructure services
-			services.AddJsonServices();
+			services.AddJsonServices(c =>
+				c.AddSerializer<Serializer>()
+			);
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.