Avoid unnecessary service instantiation during host

scott-xu · scott-xu · commit 45943555d6c3 · 2023-03-01T19:58:20.000+08:00
For non-singleton service, it will instantiate a service object during host, which is not expected.
diff --git a/src/Ninject.Extensions.Wcf/BaseNinjectServiceHostFactory.cs b/src/Ninject.Extensions.Wcf/BaseNinjectServiceHostFactory.cs
@@ -68,9 +68,19 @@ public static void SetKernel(IKernel kernel)
         /// </returns>
         protected override ServiceHost CreateServiceHost(Type serviceType, Uri[] baseAddresses)
         {
-            return (ServiceHost)kernelInstance.Get(
-                this.ServiceHostType.MakeGenericType(serviceType),
-                new ConstructorArgument("baseAddresses", baseAddresses));
+            if (ServiceTypeHelper.IsSingletonService(serviceType))
+            {
+                return (ServiceHost)kernelInstance.Get(
+                    this.ServiceHostType.MakeGenericType(serviceType),
+                    new ConstructorArgument("instance", kernelInstance.Get(serviceType)),
+                    new ConstructorArgument("baseAddresses", baseAddresses));
+            }
+            else
+            {
+                return (ServiceHost)kernelInstance.Get(
+                    this.ServiceHostType.MakeGenericType(serviceType),
+                    new ConstructorArgument("baseAddresses", baseAddresses));
+            }
         }
     }
 }
diff --git a/src/Ninject.Extensions.Wcf/BaseNinjectServiceSelfHostFactory.cs b/src/Ninject.Extensions.Wcf/BaseNinjectServiceSelfHostFactory.cs
@@ -67,9 +67,19 @@ public static void SetKernel(IKernel kernel)
         /// </returns>
         public ServiceHost CreateServiceHost(Type serviceType, Uri[] baseAddresses)
         {
-            return (ServiceHost)kernelInstance.Get(
-                this.ServiceHostType.MakeGenericType(serviceType),
-                new ConstructorArgument("baseAddresses", baseAddresses));
+            if (ServiceTypeHelper.IsSingletonService(serviceType))
+            {
+                return (ServiceHost)kernelInstance.Get(
+                    this.ServiceHostType.MakeGenericType(serviceType),
+                    new ConstructorArgument("instance", kernelInstance.Get(serviceType)),
+                    new ConstructorArgument("baseAddresses", baseAddresses));
+            }
+            else
+            {
+                return (ServiceHost)kernelInstance.Get(
+                    this.ServiceHostType.MakeGenericType(serviceType),
+                    new ConstructorArgument("baseAddresses", baseAddresses));
+            }
         }
     }
 }
diff --git a/src/Ninject.Extensions.Wcf/ServiceHost/NinjectAbstractServiceHost.cs b/src/Ninject.Extensions.Wcf/ServiceHost/NinjectAbstractServiceHost.cs
@@ -42,14 +42,20 @@ protected NinjectAbstractServiceHost(IServiceBehavior serviceBehavior, T instanc
         {
             var addresses = new UriSchemeKeyedCollection(baseAddresses);
 
-            if (ServiceTypeHelper.IsSingletonService(instance))
-            {
-                this.InitializeDescription(instance, addresses);
-            }
-            else
-            {
-                this.InitializeDescription(typeof(T), addresses);
-            }
+            this.InitializeDescription(instance, addresses);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NinjectAbstractServiceHost{T}"/> class.
+        /// </summary>
+        /// <param name="serviceBehavior">The service behavior.</param>
+        /// <param name="baseAddresses">The baseAddresses.</param>
+        protected NinjectAbstractServiceHost(IServiceBehavior serviceBehavior, Uri[] baseAddresses)
+            : base(serviceBehavior)
+        {
+            var addresses = new UriSchemeKeyedCollection(baseAddresses);
+
+            this.InitializeDescription(typeof(T), addresses);
         }
     }
 }
diff --git a/src/Ninject.Extensions.Wcf/ServiceHost/NinjectIISHostingServiceHost.cs b/src/Ninject.Extensions.Wcf/ServiceHost/NinjectIISHostingServiceHost.cs
@@ -39,5 +39,15 @@ public NinjectIISHostingServiceHost(IServiceBehavior serviceBehavior, T instance
             : base(serviceBehavior, instance, baseAddresses)
         {
         }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NinjectIISHostingServiceHost{T}"/> class.
+        /// </summary>
+        /// <param name="serviceBehavior">The service behavior.</param>
+        /// <param name="baseAddresses">The base addresses.</param>
+        public NinjectIISHostingServiceHost(IServiceBehavior serviceBehavior, Uri[] baseAddresses)
+            : base(serviceBehavior, baseAddresses)
+        {
+        }
     }
 }
diff --git a/src/Ninject.Extensions.Wcf/ServiceHost/NinjectServiceHost{T}.cs b/src/Ninject.Extensions.Wcf/ServiceHost/NinjectServiceHost{T}.cs
@@ -38,5 +38,14 @@ public NinjectServiceHost(IServiceBehavior serviceBehavior, T instance)
             : base(serviceBehavior, instance, new Uri[0])
         {
         }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NinjectServiceHost{T}"/> class.
+        /// </summary>
+        /// <param name="serviceBehavior">The service behavior.</param>
+        public NinjectServiceHost(IServiceBehavior serviceBehavior)
+            : base(serviceBehavior, new Uri[0])
+        {
+        }
     }
 }
diff --git a/src/Ninject.Extensions.Wcf/ServiceTypeHelper.cs b/src/Ninject.Extensions.Wcf/ServiceTypeHelper.cs
@@ -20,6 +20,7 @@
 
 namespace Ninject.Extensions.Wcf
 {
+    using System;
     using System.Linq;
     using System.ServiceModel;
 
@@ -31,14 +32,14 @@ internal static class ServiceTypeHelper
         /// <summary>
         /// Determines whether the given service is a singleton service.
         /// </summary>
-        /// <param name="service">The service.</param>
+        /// <param name="serviceType">The service type.</param>
         /// <returns>
         ///     <c>true</c> if the service is a singleton; otherwise, <c>false</c>.
         /// </returns>
-        public static bool IsSingletonService(object service)
+        public static bool IsSingletonService(Type serviceType)
         {
             var serviceBehaviorAttribute =
-                service.GetType().GetCustomAttributes(typeof(ServiceBehaviorAttribute), true)
+                serviceType.GetCustomAttributes(typeof(ServiceBehaviorAttribute), true)
                 .Cast<ServiceBehaviorAttribute>()
                 .SingleOrDefault();
             return serviceBehaviorAttribute != null && serviceBehaviorAttribute.InstanceContextMode == InstanceContextMode.Single;
diff --git a/src/Ninject.Extensions.Wcf/WebServiceHost/NinjectAbstractWebServiceHost.cs b/src/Ninject.Extensions.Wcf/WebServiceHost/NinjectAbstractWebServiceHost.cs
@@ -42,14 +42,20 @@ protected NinjectAbstractWebServiceHost(IServiceBehavior serviceBehavior, T inst
         {
             var addresses = new UriSchemeKeyedCollection(baseBaseAddresses);
 
-            if (ServiceTypeHelper.IsSingletonService(instance))
-            {
-                this.InitializeDescription(instance, addresses);
-            }
-            else
-            {
-                this.InitializeDescription(typeof(T), addresses);
-            }
+            this.InitializeDescription(instance, addresses);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NinjectAbstractWebServiceHost{T}"/> class.
+        /// </summary>
+        /// <param name="serviceBehavior">The service behavior.</param>
+        /// <param name="baseBaseAddresses">The base addresses.</param>
+        protected NinjectAbstractWebServiceHost(IServiceBehavior serviceBehavior, Uri[] baseBaseAddresses)
+            : base(serviceBehavior)
+        {
+            var addresses = new UriSchemeKeyedCollection(baseBaseAddresses);
+
+            this.InitializeDescription(typeof(T), addresses);
         }
     }
 }
diff --git a/src/Ninject.Extensions.Wcf/WebServiceHost/NinjectIISHostingWebServiceHost.cs b/src/Ninject.Extensions.Wcf/WebServiceHost/NinjectIISHostingWebServiceHost.cs
@@ -39,5 +39,15 @@ public NinjectIISHostingWebServiceHost(IServiceBehavior serviceBehavior, T insta
             : base(serviceBehavior, instance, baseAddresses)
         {
         }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NinjectIISHostingWebServiceHost{T}"/> class.
+        /// </summary>
+        /// <param name="serviceBehavior">The service behavior.</param>
+        /// <param name="baseAddresses">The base addresses.</param>
+        public NinjectIISHostingWebServiceHost(IServiceBehavior serviceBehavior, Uri[] baseAddresses)
+            : base(serviceBehavior, baseAddresses)
+        {
+        }
     }
 }
diff --git a/src/Ninject.Extensions.Wcf/WebServiceHost/NinjectWebServiceHost{T}.cs b/src/Ninject.Extensions.Wcf/WebServiceHost/NinjectWebServiceHost{T}.cs
@@ -38,5 +38,14 @@ public NinjectWebServiceHost(IServiceBehavior serviceBehavior, T instance)
             : base(serviceBehavior, instance, new Uri[0])
         {
         }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NinjectWebServiceHost{T}"/> class.
+        /// </summary>
+        /// <param name="serviceBehavior">The service behavior.</param>
+        public NinjectWebServiceHost(IServiceBehavior serviceBehavior)
+            : base(serviceBehavior, new Uri[0])
+        {
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,19 @@ public static void SetKernel(IKernel kernel)`
`68`	`68`	`/// </returns>`
`69`	`69`	`protected override ServiceHost CreateServiceHost(Type serviceType, Uri[] baseAddresses)`
`70`	`70`	`{`
`71`		`- return (ServiceHost)kernelInstance.Get(`
`72`		`- this.ServiceHostType.MakeGenericType(serviceType),`
`73`		`- new ConstructorArgument("baseAddresses", baseAddresses));`
	`71`	`+ if (ServiceTypeHelper.IsSingletonService(serviceType))`
	`72`	`+ {`
	`73`	`+ return (ServiceHost)kernelInstance.Get(`
	`74`	`+ this.ServiceHostType.MakeGenericType(serviceType),`
	`75`	`+ new ConstructorArgument("instance", kernelInstance.Get(serviceType)),`
	`76`	`+ new ConstructorArgument("baseAddresses", baseAddresses));`
	`77`	`+ }`
	`78`	`+ else`
	`79`	`+ {`
	`80`	`+ return (ServiceHost)kernelInstance.Get(`
	`81`	`+ this.ServiceHostType.MakeGenericType(serviceType),`
	`82`	`+ new ConstructorArgument("baseAddresses", baseAddresses));`
	`83`	`+ }`
`74`	`84`	`}`
`75`	`85`	`}`
`76`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,19 @@ public static void SetKernel(IKernel kernel)`
`67`	`67`	`/// </returns>`
`68`	`68`	`public ServiceHost CreateServiceHost(Type serviceType, Uri[] baseAddresses)`
`69`	`69`	`{`
`70`		`- return (ServiceHost)kernelInstance.Get(`
`71`		`- this.ServiceHostType.MakeGenericType(serviceType),`
`72`		`- new ConstructorArgument("baseAddresses", baseAddresses));`
	`70`	`+ if (ServiceTypeHelper.IsSingletonService(serviceType))`
	`71`	`+ {`
	`72`	`+ return (ServiceHost)kernelInstance.Get(`
	`73`	`+ this.ServiceHostType.MakeGenericType(serviceType),`
	`74`	`+ new ConstructorArgument("instance", kernelInstance.Get(serviceType)),`
	`75`	`+ new ConstructorArgument("baseAddresses", baseAddresses));`
	`76`	`+ }`
	`77`	`+ else`
	`78`	`+ {`
	`79`	`+ return (ServiceHost)kernelInstance.Get(`
	`80`	`+ this.ServiceHostType.MakeGenericType(serviceType),`
	`81`	`+ new ConstructorArgument("baseAddresses", baseAddresses));`
	`82`	`+ }`
`73`	`83`	`}`
`74`	`84`	`}`
`75`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,15 @@ public NinjectIISHostingServiceHost(IServiceBehavior serviceBehavior, T instance`
`39`	`39`	`: base(serviceBehavior, instance, baseAddresses)`
`40`	`40`	`{`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ /// <summary>`
	`44`	`+ /// Initializes a new instance of the <see cref="NinjectIISHostingServiceHost{T}"/> class.`
	`45`	`+ /// </summary>`
	`46`	`+ /// <param name="serviceBehavior">The service behavior.</param>`
	`47`	`+ /// <param name="baseAddresses">The base addresses.</param>`
	`48`	`+ public NinjectIISHostingServiceHost(IServiceBehavior serviceBehavior, Uri[] baseAddresses)`
	`49`	`+ : base(serviceBehavior, baseAddresses)`
	`50`	`+ {`
	`51`	`+ }`
`42`	`52`	`}`
`43`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,14 @@ public NinjectServiceHost(IServiceBehavior serviceBehavior, T instance)`
`38`	`38`	`: base(serviceBehavior, instance, new Uri[0])`
`39`	`39`	`{`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+ /// <summary>`
	`43`	`+ /// Initializes a new instance of the <see cref="NinjectServiceHost{T}"/> class.`
	`44`	`+ /// </summary>`
	`45`	`+ /// <param name="serviceBehavior">The service behavior.</param>`
	`46`	`+ public NinjectServiceHost(IServiceBehavior serviceBehavior)`
	`47`	`+ : base(serviceBehavior, new Uri[0])`
	`48`	`+ {`
	`49`	`+ }`
`41`	`50`	`}`
`42`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,14 @@ public NinjectWebServiceHost(IServiceBehavior serviceBehavior, T instance)`
`38`	`38`	`: base(serviceBehavior, instance, new Uri[0])`
`39`	`39`	`{`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+ /// <summary>`
	`43`	`+ /// Initializes a new instance of the <see cref="NinjectWebServiceHost{T}"/> class.`
	`44`	`+ /// </summary>`
	`45`	`+ /// <param name="serviceBehavior">The service behavior.</param>`
	`46`	`+ public NinjectWebServiceHost(IServiceBehavior serviceBehavior)`
	`47`	`+ : base(serviceBehavior, new Uri[0])`
	`48`	`+ {`
	`49`	`+ }`
`41`	`50`	`}`
`42`	`51`	`}`