Resvolution - Runtime components, fixing, cleanup

2016-09-01 11:25:00 +02:00
parent f32d984fbb
commit 18f3a7fbab
23 changed files with 773 additions and 528 deletions
--- a/src/Umbraco.Core/CoreRuntimeComponent.cs
+++ b/src/Umbraco.Core/CoreRuntimeComponent.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AutoMapper;
+using LightInject;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Components;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.DependencyInjection;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Manifest;
+using Umbraco.Core.Models.Mapping;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Persistence.Migrations;
+using Umbraco.Core.Plugins;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Core.Strings;
+using Umbraco.Core.Sync;
+using Umbraco.Core._Legacy.PackageActions;
+
+namespace Umbraco.Core
+{
+    public class CoreRuntimeComponent : UmbracoComponentBase, IRuntimeComponent
+    {
+        public override void Compose(ServiceContainer container)
+        {
+            base.Compose(container);
+
+            // register from roots
+            container.RegisterFrom<ConfigurationCompositionRoot>();
+            container.RegisterFrom<RepositoryCompositionRoot>();
+            container.RegisterFrom<ServicesCompositionRoot>();
+            container.RegisterFrom<CoreModelMappersCompositionRoot>();
+
+            //TODO: Don't think we'll need this when the resolvers are all container resolvers
+            container.RegisterSingleton<IServiceProvider, ActivatorServiceProvider>();
+            container.RegisterSingleton<ApplicationContext>();
+            container.Register<MediaFileSystem>(factory => FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>());
+
+            // fixme - should we capture Logger, etc here or use factory?
+
+            // register manifest builder, will be injected in eg PropertyEditorCollectionBuilder
+            container.RegisterSingleton(factory
+                => new ManifestParser(factory.GetInstance<ILogger>(), new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")), factory.GetInstance<IRuntimeCacheProvider>()));
+            container.RegisterSingleton<ManifestBuilder>();
+
+            PropertyEditorCollectionBuilder.Register(container)
+                .AddProducer(factory => factory.GetInstance<PluginManager>().ResolvePropertyEditors());
+
+            ParameterEditorCollectionBuilder.Register(container)
+                .AddProducer(factory => factory.GetInstance<PluginManager>().ResolveParameterEditors());
+
+            // register our predefined validators
+            ValidatorCollectionBuilder.Register(container)
+                .Add<RequiredManifestValueValidator>()
+                .Add<RegexValidator>()
+                .Add<DelimitedManifestValueValidator>()
+                .Add<EmailValidator>()
+                .Add<IntegerValidator>()
+                .Add<DecimalValidator>();
+
+            // register a server registrar, by default it's the db registrar unless the dev
+            // has the legacy dist calls enabled - fixme - should obsolete the legacy thing
+            container.RegisterSingleton(factory => UmbracoConfig.For.UmbracoSettings().DistributedCall.Enabled
+                ? (IServerRegistrar)new ConfigServerRegistrar(UmbracoConfig.For.UmbracoSettings())
+                : (IServerRegistrar)new DatabaseServerRegistrar(
+                    new Lazy<IServerRegistrationService>(() => factory.GetInstance<ApplicationContext>().Services.ServerRegistrationService),
+                    new DatabaseServerRegistrarOptions()));
+
+            // by default we'll use the database server messenger with default options (no callbacks),
+            // this will be overridden in the web startup
+            // fixme - painful, have to take care of lifetime! - we CANNOT ask users to remember!
+            // fixme - same issue with PublishedContentModelFactory and many more, I guess!
+            container.RegisterSingleton<IServerMessenger>(factory
+                => new DatabaseServerMessenger(factory.GetInstance<ApplicationContext>(), true, new DatabaseServerMessengerOptions()));
+
+            CacheRefresherCollectionBuilder.Register(container)
+                .AddProducer(factory => factory.GetInstance<PluginManager>().ResolveCacheRefreshers());
+
+            PackageActionCollectionBuilder.Register(container)
+                .AddProducer(f => f.GetInstance<PluginManager>().ResolvePackageActions());
+
+            MigrationCollectionBuilder.Register(container)
+                .AddProducer(factory => factory.GetInstance<PluginManager>().ResolveTypes<IMigration>());
+
+            // need to filter out the ones we dont want!! fixme - what does that mean?
+            PropertyValueConverterCollectionBuilder.Register(container)
+                .Append(factory => factory.GetInstance<PluginManager>().ResolveTypes<IPropertyValueConverter>());
+
+            container.RegisterSingleton<IShortStringHelper>(factory
+                => new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(factory.GetInstance<IUmbracoSettingsSection>())));
+
+            UrlSegmentProviderCollectionBuilder.Register(container)
+                .Append<DefaultUrlSegmentProvider>();
+
+            // by default, register a noop factory
+            container.RegisterSingleton<IPublishedContentModelFactory, NoopPublishedContentModelFactory>();
+        }
+
+        public void Initialize(IEnumerable<ModelMapperConfiguration> modelMapperConfigurations)
+        {
+            //TODO: Remove these for v8!
+            LegacyPropertyEditorIdToAliasConverter.CreateMappingsForCoreEditors();
+            LegacyParameterEditorAliasConverter.CreateMappingsForCoreEditors();
+
+            InitializeModelMappers(modelMapperConfigurations);
+
+        }
+
+        private void InitializeModelMappers(IEnumerable<ModelMapperConfiguration> modelMapperConfigurations)
+        {
+            Mapper.Initialize(configuration =>
+            {
+                // fixme why ApplicationEventHandler?!
+                //foreach (var m in ApplicationEventsResolver.Current.ApplicationEventHandlers.OfType<IMapperConfiguration>())
+                foreach (var m in modelMapperConfigurations)
+                {
+                    //Logger.Debug<CoreRuntime>("FIXME " + m.GetType().FullName);
+                    m.ConfigureMappings(configuration, Current.ApplicationContext);
+                }
+            });
+        }
+    }
+}