Implement IServiceProviderIsService

Author: dahlbyk

src/StructureMap.Microsoft.DependencyInjection/ContainerExtensions.cs

@@ -137,6 +137,11 @@ public static void Register(this IProfileRegistry registry, IEnumerable<ServiceD
                 .LifecycleIs(Lifecycles.Container)
                 .UseIfNone<StructureMapServiceScopeFactory>();
 
+            // Added in MEDI v6
+            registry.For<IServiceProviderIsService>()
+                .LifecycleIs(Lifecycles.Container)
+                .UseIfNone<StructureMapServiceProviderIsService>();
+
             foreach (var descriptor in descriptors)
             {
                 registry.Register(descriptor);

src/StructureMap.Microsoft.DependencyInjection/StructureMapServiceProviderIsService.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace StructureMap
+{
+    public sealed class StructureMapServiceProviderIsService : IServiceProviderIsService
+    {
+        private readonly IContainer _container;
+
+        public StructureMapServiceProviderIsService(IContainer container) => _container = container;
+
+        // https://github.com/dotnet/dotnet/blob/d25d3482f4c3c509977cc4d959c80cb78b6ad9c8/src/runtime/src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteFactory.cs#L778-L803
+        public bool IsService(Type serviceType)
+        {
+            if (serviceType is null)
+            {
+                throw new ArgumentNullException(nameof(serviceType));
+            }
+
+            // Querying for an open generic should return false (they aren't resolvable)
+            if (serviceType.IsGenericTypeDefinition)
+            {
+                return false;
+            }
+
+            if (_container.Model.HasDefaultImplementationFor(serviceType))
+            {
+                return true;
+            }
+
+
+            if (serviceType.IsConstructedGenericType && serviceType.GetGenericTypeDefinition() is Type genericDefinition)
+            {
+                // We special case IEnumerable since it isn't explicitly registered in the container
+                // yet we can manifest instances of it when requested.
+                return genericDefinition == typeof(IEnumerable<>) ||
+                    _container.Model.HasDefaultImplementationFor(genericDefinition);
+            }
+
+            return false;
+        }
+    }
+}

test/StructureMap.Microsoft.DependencyInjection.Tests/StructureMapContainerTests.cs

@@ -12,8 +12,6 @@ namespace StructureMap.Microsoft.DependencyInjection.Tests
 {
     public class StructureMapContainerTests : DependencyInjectionSpecificationTests
     {
-        public override bool SupportsIServiceProviderIsService => false;
-
         // The following tests don't pass with the SM adapter...
         private static readonly string[] SkippedTests =
         {
@@ -61,6 +59,14 @@ public void ConfigureAndRegisterDoNotPreventPopulate()
             Assert.NotNull(container.GetInstance<IFakeService>());
             Assert.NotNull(container.GetInstance<IFakeSingletonService>());
             Assert.NotNull(container.GetInstance<IFakeScopedService>());
+
+            var spis = container.GetInstance<IServiceProviderIsService>();
+            Assert.True(spis.IsService(typeof(IFakeService)));
+            Assert.True(spis.IsService(typeof(IFakeScopedService)));
+            Assert.True(spis.IsService(typeof(IFakeSingletonService)));
+
+            Assert.False(spis.IsService(typeof(FakeService)));
+            Assert.False(spis.IsService(typeof(IFakeServiceInstance)));
         }
 
         [Fact]
@@ -77,6 +83,7 @@ public void ConfigureDoesNotRequirePopulate()
             Assert.NotNull(container.GetInstance<IFakeScopedService>());
 
             Assert.NotNull(container.GetInstance<IServiceProvider>());
+            Assert.NotNull(container.GetInstance<IServiceProviderIsService>());
             Assert.NotNull(container.GetInstance<IServiceScopeFactory>());
         }
 
@@ -95,6 +102,7 @@ public void RegisterDoesNotRequirePopulate()
             Assert.NotNull(container.GetInstance<IFakeScopedService>());
 
             Assert.NotNull(container.GetInstance<IServiceProvider>());
+            Assert.NotNull(container.GetInstance<IServiceProviderIsService>());
             Assert.NotNull(container.GetInstance<IServiceScopeFactory>());
         }