Adds overloads to endpoint builder

Author: gislikonrad

Solid.AspNetCore.Extensions.Wcf.Tests/Host/MulitpleContractTestStartup.cs

@@ -25,10 +25,11 @@ public void Configure(IApplicationBuilder builder)
                 .Use(async (context, next) =>
                 {
                     if(context.Request.Path.StartsWithSegments("/replaceecho"))
-                        context.Request.Path = "/multiple/echo";
+                        context.Request.Path = "/multiple/endpoints/echo/endpoint";
                     await next();
                 })
-                .UseWcfService<MultipleContract>("/multiple", b => b.AddServiceEndpoint<IEchoContract>("/echo").AddServiceEndpoint<ICounterContract>("counter"));
+                .UseWcfService<MultipleContract>("/multiple/endpoints", b => 
+                    b.AddServiceEndpoint<IEchoContract>("/echo/endpoint").AddServiceEndpoint<ICounterContract>("counter/endpoint"));
         }
 
         ServiceHost CreateServiceHost(IServiceProvider provider, MultipleContract singleton, Type type, Uri[] baseAddresses)

Solid.AspNetCore.Extensions.Wcf.Tests/MultipleContractTestFixture.cs

@@ -29,7 +29,7 @@ public IEchoContract GetEchoService()
         {
             if (_echo == null)
             {
-                var url = new Uri(TestingServer.BaseAddress, "multiple/echo");
+                var url = new Uri(TestingServer.BaseAddress, "multiple/endpoints/echo/endpoint");
                 var binding = new BasicHttpBinding();
                 var endpoint = new EndpointAddress(url);
                 var factory = new ChannelFactory<IEchoContract>(binding, endpoint);
@@ -69,7 +69,7 @@ public ICounterContract GetCounterService()
         {
             if (_counter == null)
             {
-                var url = new Uri(TestingServer.BaseAddress, "multiple/counter");
+                var url = new Uri(TestingServer.BaseAddress, "multiple/endpoints/counter/endpoint");
                 var binding = new BasicHttpBinding();
                 var endpoint = new EndpointAddress(url);
                 var factory = new ChannelFactory<ICounterContract>(binding, endpoint);

Solid.AspNetCore.Extensions.Wcf/Abstractions/IEndpointBuilder.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.ServiceModel.Channels;
+using System.ServiceModel.Description;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -21,6 +22,14 @@ public interface IEndpointBuilder<TService>
         /// <returns>The endpoint builder</returns>
         IEndpointBuilder<TService> AddServiceEndpoint<TContract>();
 
+        /// <summary>
+        /// Adds a service endpoint using the default binding to the base address of a service host
+        /// </summary>
+        /// <typeparam name="TContract">The contract type of the service endpoint</typeparam>
+        /// <param name="action">An action to alter the ServiceEndpoint</param>
+        /// <returns>The endpoint builder</returns>
+        IEndpointBuilder<TService> AddServiceEndpoint<TContract>(Action<IServiceProvider, ServiceEndpoint> action);
+
         /// <summary>
         /// Adds a service endpoint using the default binding to a specified path on a service host
         /// </summary>
@@ -29,22 +38,50 @@ public interface IEndpointBuilder<TService>
         /// <returns>The endpoint builder</returns>
         IEndpointBuilder<TService> AddServiceEndpoint<TContract>(string path);
 
+        /// <summary>
+        /// Adds a service endpoint using the default binding to a specified path on a service host
+        /// </summary>
+        /// <typeparam name="TContract">The contract type of the service endpoint</typeparam>
+        /// <param name="path">The sub path for the endpoint</param>
+        /// <param name="action">An action to alter the ServiceEndpoint</param>
+        /// <returns>The endpoint builder</returns>
+        IEndpointBuilder<TService> AddServiceEndpoint<TContract>(string path, Action<IServiceProvider, ServiceEndpoint> action);
+
         /// <summary>
         /// Adds a service endpoint using the provided binding to the base address of a service host
         /// </summary>
         /// <typeparam name="TContract">The contract type of the service endpoint</typeparam>
-        /// <param name="binding"></param>
+        /// <param name="binding">The binding for the endpoint</param>
         /// <returns>The endpoint builder</returns>
         IEndpointBuilder<TService> AddServiceEndpoint<TContract>(Binding binding);
 
+        /// <summary>
+        /// Adds a service endpoint using the provided binding to the base address of a service host
+        /// </summary>
+        /// <typeparam name="TContract">The contract type of the service endpoint</typeparam>
+        /// <param name="binding">The binding for the endpoint</param>
+        /// <param name="action">An action to alter the ServiceEndpoint</param>
+        /// <returns>The endpoint builder</returns>
+        IEndpointBuilder<TService> AddServiceEndpoint<TContract>(Binding binding, Action<IServiceProvider, ServiceEndpoint> action);
+
         /// <summary>
         /// Adds a service endpoint using the provided binding to a specified path on a service host
         /// </summary>
         /// <typeparam name="TContract">The contract type of the service endpoint</typeparam>
-        /// <param name="binding"></param>
+        /// <param name="binding">The binding for the endpoint</param>
         /// <param name="path">The sub path for the endpoint</param>
         /// <returns>The endpoint builder</returns>
         IEndpointBuilder<TService> AddServiceEndpoint<TContract>(Binding binding, string path);
 
+        /// <summary>
+        /// Adds a service endpoint using the provided binding to a specified path on a service host
+        /// </summary>
+        /// <typeparam name="TContract">The contract type of the service endpoint</typeparam>
+        /// <param name="binding">The binding for the endpoint</param>
+        /// <param name="path">The sub path for the endpoint</param>
+        /// <param name="action">An action to alter the ServiceEndpoint</param>
+        /// <returns>The endpoint builder</returns>
+        IEndpointBuilder<TService> AddServiceEndpoint<TContract>(Binding binding, string path, Action<IServiceProvider, ServiceEndpoint> action);
+
     }
 }

Solid.AspNetCore.Extensions.Wcf/Abstractions/IServiceHostFactoryDelegateFactory.cs

@@ -0,0 +1,16 @@
+using Solid.AspNetCore.Extensions.Wcf.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.ServiceModel;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Solid.AspNetCore.Extensions.Wcf.Abstractions
+{
+    internal interface IServiceHostFactoryDelegateFactory
+    {
+        ServiceHostFactoryDelegate<TService> Create<TService, TServiceHost>()
+            where TServiceHost : ServiceHost;
+    }
+}

Solid.AspNetCore.Extensions.Wcf/Builders/EndpointBuilder.cs

@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using System.ServiceModel;
+using System.ServiceModel.Description;
 
 namespace Solid.AspNetCore.Extensions.Wcf.Builders
 {
@@ -41,7 +42,30 @@ public IEndpointBuilder<TService> AddServiceEndpoint<TContract>(Binding binding)
 
         public IEndpointBuilder<TService> AddServiceEndpoint<TContract>(Binding binding, string path)
         {
-            _host.AddServiceEndpoint(typeof(TContract), SanitizeBinding(binding), path);
+            return AddServiceEndpoint<TContract>(binding, path, (_1, _2) => { });
+        }
+
+        public IEndpointBuilder<TService> AddServiceEndpoint<TContract>(Action<IServiceProvider, ServiceEndpoint> action)
+        {
+            var binding = _services.GetService<Binding>();
+            return AddServiceEndpoint<TContract>(binding, action);
+        }
+
+        public IEndpointBuilder<TService> AddServiceEndpoint<TContract>(string path, Action<IServiceProvider, ServiceEndpoint> action)
+        {
+            var binding = _services.GetService<Binding>();
+            return AddServiceEndpoint<TContract>(binding, path, action);
+        }
+
+        public IEndpointBuilder<TService> AddServiceEndpoint<TContract>(Binding binding, Action<IServiceProvider, ServiceEndpoint> action)
+        {
+            return AddServiceEndpoint<TContract>(binding, string.Empty, action);
+        }
+
+        public IEndpointBuilder<TService> AddServiceEndpoint<TContract>(Binding binding, string path, Action<IServiceProvider, ServiceEndpoint> action)
+        {
+            var endpoint = _host.AddServiceEndpoint(typeof(TContract), SanitizeBinding(binding), path);
+            action(_services, endpoint);
             return this;
         }