RM-5931: Register IServiceConfigurationDiscoveryService as a bootstrapped service.

Author: MichaelKetting

Remotion/Core/Core/ServiceLocation/BootstrapServiceConfiguration.cs

@@ -40,9 +40,6 @@ public BootstrapServiceConfiguration ()
       // Logging
       RegisterInstanceAsSingleton<ILogManager, Log4NetLogManager>(() => new Log4NetLogManager());
 
-      // Service Location
-      RegisterImplementationAsSingleton<IServiceLocatorProvider, DefaultServiceLocatorProvider>();
-
       // Type resolution
       RegisterImplementationAsSingleton<ITypeResolutionService, DefaultTypeResolutionService>();
 
@@ -57,6 +54,10 @@ public BootstrapServiceConfiguration ()
 #endif
       RegisterDecoratedImplementationAsSingleton<IAssemblyFinder, AssemblyFinder, CachingAssemblyFinderDecorator>();
       RegisterImplementationAsSingleton<ITypeDiscoveryService, AssemblyFinderTypeDiscoveryService>();
+
+      // Service Location
+      RegisterImplementationAsSingleton<IServiceLocatorProvider, DefaultServiceLocatorProvider>();
+      RegisterImplementationAsSingleton<IServiceConfigurationDiscoveryService, DefaultServiceConfigurationDiscoveryService>();
     }
 
     public IReadOnlyCollection<ServiceConfigurationEntry> GetRegistrations ()

Remotion/Core/Core/ServiceLocation/BootstrapServiceConfigurationDiscoveryService.cs

@@ -0,0 +1,57 @@
+// This file is part of the re-motion Core Framework (www.re-motion.org)
+// Copyright (c) rubicon IT GmbH, www.rubicon.eu
+// 
+// The re-motion Core Framework is free software; you can redistribute it
+// and/or modify it under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation; either version 2.1 of the
+// License, or (at your option) any later version.
+// 
+// re-motion is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public License
+// along with re-motion; if not, see http://www.gnu.org/licenses.
+// 
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Remotion.Reflection;
+
+namespace Remotion.ServiceLocation
+{
+  /// <summary>
+  /// Implementation of the <see cref="IServiceConfigurationDiscoveryService"/> used only to satisfy a mandatory parameter requirement
+  /// when instantiating the <see cref="DefaultServiceLocatorProvider"/> in a bootstrapping context.
+  /// </summary>
+  internal class BootstrapServiceConfigurationDiscoveryService : IServiceConfigurationDiscoveryService
+  {
+    public BootstrapServiceConfigurationDiscoveryService ()
+    {
+    }
+
+    public IEnumerable<ServiceConfigurationEntry> GetDefaultConfiguration ()
+    {
+      throw new NotSupportedException($"The {nameof(BootstrapServiceConfigurationDiscoveryService)} does not support the automatic composition of the service configuration.");
+    }
+
+    public IEnumerable<ServiceConfigurationEntry> GetDefaultConfiguration (IEnumerable<Type> serviceTypes)
+    {
+      throw new NotSupportedException($"The {nameof(BootstrapServiceConfigurationDiscoveryService)} does not support the automatic composition of the service configuration.");
+    }
+
+    public IEnumerable<ServiceConfigurationEntry> GetDefaultConfiguration (IEnumerable<Assembly> assemblies)
+    {
+      throw new NotSupportedException($"The {nameof(BootstrapServiceConfigurationDiscoveryService)} does not support the automatic composition of the service configuration.");
+    }
+
+    public ServiceConfigurationEntry GetDefaultConfiguration (Type serviceType)
+    {
+      throw new NotSupportedException(
+          $"The {nameof(BootstrapServiceConfigurationDiscoveryService)} does not support the automatic composition of the service configuration for a type. "
+          + $"Register the requested type '{serviceType.GetFullNameSafe()}' via {nameof(SafeServiceLocator)}.{nameof(SafeServiceLocator.BootstrapConfiguration)} "
+          + $"before resolving an instance of the type.");
+    }
+  }
+}

Remotion/Core/Core/ServiceLocation/DefaultServiceLocator.Registration.cs

@@ -85,7 +85,7 @@ private Registration GetOrCreateRegistrationWithActivationException (Type servic
 
     private Registration CreateRegistrationFromType (Type serviceType)
     {
-      var serviceConfigurationEntry = _serviceConfigurationDiscoveryService.GetDefaultConfiguration(serviceType);
+      var serviceConfigurationEntry = ServiceConfigurationDiscoveryService.GetDefaultConfiguration(serviceType);
       return CreateRegistration(serviceConfigurationEntry);
     }
 

Remotion/Core/Core/ServiceLocation/DefaultServiceLocator.cs

@@ -77,13 +77,13 @@ public static DefaultServiceLocator CreateWithBootstrappedServices ()
       return defaultServiceLocator;
     }
 
-    private readonly IServiceConfigurationDiscoveryService _serviceConfigurationDiscoveryService;
+    public IServiceConfigurationDiscoveryService ServiceConfigurationDiscoveryService { get; }
 
     public DefaultServiceLocator (IServiceConfigurationDiscoveryService serviceConfigurationDiscoveryService)
     {
       ArgumentUtility.CheckNotNull("serviceConfigurationDiscoveryService", serviceConfigurationDiscoveryService);
 
-      _serviceConfigurationDiscoveryService = serviceConfigurationDiscoveryService;
+      ServiceConfigurationDiscoveryService = serviceConfigurationDiscoveryService;
 
       // Optimized for memory allocations
       _createRegistrationFromTypeFunc = CreateRegistrationFromType;

Remotion/Core/Core/ServiceLocation/DefaultServiceLocatorProvider.cs

@@ -16,7 +16,6 @@
 // 
 using System;
 using System.Collections.Generic;
-using Remotion.Reflection;
 using Remotion.Utilities;
 
 namespace Remotion.ServiceLocation
@@ -29,16 +28,20 @@ public class DefaultServiceLocatorProvider : IServiceLocatorProvider
   {
     public const int Position = 0;
 
-    public DefaultServiceLocatorProvider ()
+    public IServiceConfigurationDiscoveryService ServiceConfigurationDiscoveryService { get; }
+
+    public DefaultServiceLocatorProvider (IServiceConfigurationDiscoveryService serviceConfigurationDiscoveryService)
     {
+      ArgumentUtility.CheckNotNull("serviceConfigurationDiscoveryService", serviceConfigurationDiscoveryService);
+
+      ServiceConfigurationDiscoveryService = serviceConfigurationDiscoveryService;
     }
 
     public IServiceLocator GetServiceLocator (IReadOnlyCollection<ServiceConfigurationEntry> serviceConfigurationEntries)
     {
       ArgumentUtility.CheckNotNull("serviceConfigurationEntries", serviceConfigurationEntries);
 
-      var defaultServiceConfigurationDiscoveryService = new DefaultServiceConfigurationDiscoveryService(ContextAwareTypeUtility.GetTypeDiscoveryService());
-      var defaultServiceLocator = new DefaultServiceLocator(defaultServiceConfigurationDiscoveryService);
+      var defaultServiceLocator = new DefaultServiceLocator(ServiceConfigurationDiscoveryService);
       foreach (var serviceConfigurationEntry in serviceConfigurationEntries)
         defaultServiceLocator.Register(serviceConfigurationEntry);
 

Remotion/Core/Core/ServiceLocation/SafeServiceLocator.cs

@@ -110,7 +110,7 @@ private static IServiceLocator GetDefaultServiceLocator ()
 
       // Temporarily set the bootstrapper to allow for reentrancy to SafeServiceLocator.Current.
       // Since we're called from s_defaultServiceLocator.Value's getter, we can be sure that our return value will overwrite the bootstrapper.
-      var bootstrapServiceLocatorProvider = new DefaultServiceLocatorProvider();
+      var bootstrapServiceLocatorProvider = new DefaultServiceLocatorProvider(new BootstrapServiceConfigurationDiscoveryService());
       var bootstrapServiceLocator = bootstrapServiceLocatorProvider.GetServiceLocator(bootstrapServiceLocatorEntries);
       s_fields.DefaultServiceLocator.Value = bootstrapServiceLocator;
 

Remotion/Core/UnitTests/ServiceLocation/BootstrapServiceConfigurationTest.cs

@@ -70,7 +70,7 @@ public void GetRegistrations_HasDefaultRegistrations ()
               new[]
               {
                   typeof(ILogManager),
-                  typeof(IServiceLocatorProvider),
+                  typeof(IServiceLocatorProvider), typeof(IServiceConfigurationDiscoveryService),
                   typeof(ITypeResolutionService),
                   typeof(IAppContextProvider), typeof(IAssemblyLoader), typeof(IAssemblyLoaderFilter), typeof(IRootAssemblyFinder), typeof(IAssemblyFinder),
                   typeof(ITypeDiscoveryService)
@@ -81,7 +81,7 @@ public void GetRegistrations_HasDefaultRegistrations ()
               new[]
               {
                   typeof(Log4NetLogManager),
-                  typeof(DefaultServiceLocatorProvider),
+                  typeof(DefaultServiceLocatorProvider), typeof(DefaultServiceConfigurationDiscoveryService),
                   typeof(DefaultTypeResolutionService),
                   typeof(AppContextProvider), typeof(FilteringAssemblyLoader), typeof(ApplicationAssemblyLoaderFilter),
 #if NETFRAMEWORK

Remotion/Core/UnitTests/ServiceLocation/DefaultServiceLocatorProviderTest.cs

@@ -15,6 +15,7 @@
 // along with re-motion; if not, see http://www.gnu.org/licenses.
 // 
 using System;
+using Moq;
 using NUnit.Framework;
 using Remotion.ServiceLocation;
 
@@ -23,28 +24,25 @@ namespace Remotion.UnitTests.ServiceLocation
   [TestFixture]
   public class DefaultServiceLocatorProviderTest
   {
-    private DefaultServiceLocatorProvider _provider;
-
-    [SetUp]
-    public void SetUp ()
-    {
-      _provider = new DefaultServiceLocatorProvider();
-    }
-
     [Test]
     public void GetServiceLocator ()
     {
-      var sloc = _provider.GetServiceLocator(Array.AsReadOnly(new ServiceConfigurationEntry[0]));
+      var serviceConfigurationDiscoveryServiceStub = Mock.Of<IServiceConfigurationDiscoveryService>(MockBehavior.Strict);
+      var provider = new DefaultServiceLocatorProvider(serviceConfigurationDiscoveryServiceStub);
+      var sloc = provider.GetServiceLocator(Array.AsReadOnly(new ServiceConfigurationEntry[0]));
 
       Assert.That(sloc, Is.TypeOf<DefaultServiceLocator>());
+      Assert.That(((DefaultServiceLocator)sloc).ServiceConfigurationDiscoveryService, Is.SameAs(serviceConfigurationDiscoveryServiceStub));
     }
 
     [Test]
     public void GetServiceLocator_IncludesBootstrapConfiguration ()
     {
       var entry = new ServiceConfigurationEntry(typeof(IService), new ServiceImplementationInfo(typeof(Service), LifetimeKind.InstancePerDependency));
 
-      var sloc = _provider.GetServiceLocator(Array.AsReadOnly(new[] { entry }));
+      var serviceConfigurationDiscoveryServiceStub = Mock.Of<IServiceConfigurationDiscoveryService>(MockBehavior.Strict);
+      var provider = new DefaultServiceLocatorProvider(serviceConfigurationDiscoveryServiceStub);
+      var sloc = provider.GetServiceLocator(Array.AsReadOnly(new[] { entry }));
 
       Assert.That(sloc, Is.TypeOf<DefaultServiceLocator>());
       Assert.That(sloc.GetInstance<IService>(), Is.Not.Null.And.TypeOf<Service>());