From da685167f75bcb6beb09d9a15be3b19b269db3de Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Sat, 13 Aug 2016 16:23:17 +0200
Subject: [PATCH] Resvolution - UrlSegmentProviderResolver

---
 src/Umbraco.Core/CoreBootManager.cs                       | 4 ++--
 .../Strings/UrlSegmentProviderCollectionBuilder.cs        | 8 +-------
 .../Cache/PublishedCache/PublishedMediaCacheTests.cs      | 4 ++--
 src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs | 8 ++++----
 src/Umbraco.Web/Current.cs                                | 2 +-
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index 615182ccb1..68e9684223 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -471,8 +471,8 @@ namespace Umbraco.Core
             ShortStringHelperResolver.Current = new ShortStringHelperResolver(Container,
                 factory => new DefaultShortStringHelper(factory.GetInstance<IUmbracoSettingsSection>()).WithDefaultConfig());
 
-            Container.RegisterBuilderCollection<UrlSegmentProviderCollectionBuilder, UrlSegmentProviderCollection, IUrlSegmentProvider, PerContainerLifetime>();
-            Container.GetInstance<UrlSegmentProviderCollectionBuilder>().Append<DefaultUrlSegmentProvider>();
+            UrlSegmentProviderCollectionBuilder.Register(Container)
+                .Append<DefaultUrlSegmentProvider>();
 
             // by default, no factory is activated
             PublishedContentModelFactoryResolver.Current = new PublishedContentModelFactoryResolver(Container);
diff --git a/src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs b/src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs
index 93f59e35c6..084970fad1 100644
--- a/src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs
+++ b/src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using LightInject;
+using LightInject;
 using Umbraco.Core.DependencyInjection;
 
 namespace Umbraco.Core.Strings
@@ -11,10 +10,5 @@ namespace Umbraco.Core.Strings
         { }
 
         protected override UrlSegmentProviderCollectionBuilder This => this;
-
-        protected override UrlSegmentProviderCollection CreateCollection(IEnumerable<IUrlSegmentProvider> items)
-        {
-            return new UrlSegmentProviderCollection(items);
-        }
     }
 }
diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
index a8b644ab93..9c59c22151 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
@@ -33,8 +33,8 @@ namespace Umbraco.Tests.Cache.PublishedCache
             var container = new ServiceContainer();
             container.ConfigureUmbracoCore();
 
-            container.RegisterBuilderCollection<UrlSegmentProviderCollectionBuilder, UrlSegmentProviderCollection, IUrlSegmentProvider>();
-            container.GetInstance<UrlSegmentProviderCollectionBuilder>().Append<DefaultUrlSegmentProvider>();
+            UrlSegmentProviderCollectionBuilder.Register(container)
+                .Append<DefaultUrlSegmentProvider>();
 
             PublishedContentModelFactoryResolver.Current = new PublishedContentModelFactoryResolver();
             base.FreezeResolution();
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
index 549fccfa51..08ecb4b02e 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
@@ -40,8 +40,8 @@ namespace Umbraco.Tests.PublishedContent
             var container = new ServiceContainer();
             container.ConfigureUmbracoCore();
 
-            container.RegisterBuilderCollection<UrlSegmentProviderCollectionBuilder, UrlSegmentProviderCollection, IUrlSegmentProvider>();
-            container.GetInstance<UrlSegmentProviderCollectionBuilder>().Append<DefaultUrlSegmentProvider>();
+            UrlSegmentProviderCollectionBuilder.Register(container)
+                .Append<DefaultUrlSegmentProvider>();
 
             base.FreezeResolution();
         }
@@ -67,7 +67,7 @@ namespace Umbraco.Tests.PublishedContent
 
         [Test]
         public void Get_Property_Value_Uses_Converter()
-        {            
+        {
             var mType = MockedContentTypes.CreateImageMediaType("image2");
             //lets add an RTE to this
             mType.PropertyGroups.First().PropertyTypes.Add(
@@ -121,7 +121,7 @@ namespace Umbraco.Tests.PublishedContent
                 }
             }
 
-            
+
 
 
 
diff --git a/src/Umbraco.Web/Current.cs b/src/Umbraco.Web/Current.cs
index fb4704b504..9a112dbb6c 100644
--- a/src/Umbraco.Web/Current.cs
+++ b/src/Umbraco.Web/Current.cs
@@ -121,7 +121,7 @@ namespace Umbraco.Web
         // proxy Core for convenience
 
         public static UrlSegmentProviderCollection UrlSegmentProviders
-            => CoreCurrent.Container.GetInstance<UrlSegmentProviderCollection>();
+            => Container.GetInstance<UrlSegmentProviderCollection>();
 
         public static CacheRefresherCollection CacheRefreshers
             => Container.GetInstance<CacheRefresherCollection>();