From 7573d528074871e980341b171fcb61b42b02c54a Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 26 Nov 2019 11:09:33 +0000
Subject: [PATCH] Initial plumbing, extension methods etc for collection to
 store IDataValueReferences

---
 src/Umbraco.Core/Composing/Current.cs                |  3 +++
 src/Umbraco.Core/CompositionExtensions.cs            |  7 +++++++
 .../PropertyEditors/DataValueReferenceCollection.cs  | 12 ++++++++++++
 .../DataValueReferenceCollectionBuilder.cs           |  9 +++++++++
 src/Umbraco.Core/Runtime/CoreInitialComposer.cs      |  4 ++++
 src/Umbraco.Core/Umbraco.Core.csproj                 |  2 ++
 src/Umbraco.Web/Composing/Current.cs                 |  2 ++
 7 files changed, 39 insertions(+)
 create mode 100644 src/Umbraco.Core/PropertyEditors/DataValueReferenceCollection.cs
 create mode 100644 src/Umbraco.Core/PropertyEditors/DataValueReferenceCollectionBuilder.cs

diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs
index f12bf0dd63..1bd56ed727 100644
--- a/src/Umbraco.Core/Composing/Current.cs
+++ b/src/Umbraco.Core/Composing/Current.cs
@@ -154,6 +154,9 @@ namespace Umbraco.Core.Composing
         public static DataEditorCollection DataEditors
             => Factory.GetInstance<DataEditorCollection>();
 
+        public static DataValueReferenceCollection DataValueReferences
+            => Factory.GetInstance<DataValueReferenceCollection>();
+
         public static PropertyEditorCollection PropertyEditors
             => Factory.GetInstance<PropertyEditorCollection>();
 
diff --git a/src/Umbraco.Core/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs
index 5dd33c2a60..d29f251edc 100644
--- a/src/Umbraco.Core/CompositionExtensions.cs
+++ b/src/Umbraco.Core/CompositionExtensions.cs
@@ -49,6 +49,13 @@ namespace Umbraco.Core
         public static DataEditorCollectionBuilder DataEditors(this Composition composition)
             => composition.WithCollectionBuilder<DataEditorCollectionBuilder>();
 
+        /// <summary>
+        /// Gets the data value reference collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static DataValueReferenceCollectionBuilder DataValueReferences(this Composition composition)
+            => composition.WithCollectionBuilder<DataValueReferenceCollectionBuilder>();
+
         /// <summary>
         /// Gets the property value converters collection builder.
         /// </summary>
diff --git a/src/Umbraco.Core/PropertyEditors/DataValueReferenceCollection.cs b/src/Umbraco.Core/PropertyEditors/DataValueReferenceCollection.cs
new file mode 100644
index 0000000000..6d0e3e62df
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/DataValueReferenceCollection.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    public class DataValueReferenceCollection : BuilderCollectionBase<IDataValueReference>
+    {
+        public DataValueReferenceCollection(IEnumerable<IDataValueReference> items)
+            : base(items)
+        { }
+    }
+}
diff --git a/src/Umbraco.Core/PropertyEditors/DataValueReferenceCollectionBuilder.cs b/src/Umbraco.Core/PropertyEditors/DataValueReferenceCollectionBuilder.cs
new file mode 100644
index 0000000000..0f8ee1bd8e
--- /dev/null
+++ b/src/Umbraco.Core/PropertyEditors/DataValueReferenceCollectionBuilder.cs
@@ -0,0 +1,9 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    public class DataValueReferenceCollectionBuilder : LazyCollectionBuilderBase<DataValueReferenceCollectionBuilder, DataValueReferenceCollection, IDataValueReference>
+    {
+        protected override DataValueReferenceCollectionBuilder This => this;
+    }
+}
diff --git a/src/Umbraco.Core/Runtime/CoreInitialComposer.cs b/src/Umbraco.Core/Runtime/CoreInitialComposer.cs
index 86e61aeb90..db308d720c 100644
--- a/src/Umbraco.Core/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Core/Runtime/CoreInitialComposer.cs
@@ -75,6 +75,10 @@ namespace Umbraco.Core.Runtime
             composition.RegisterUnique<PropertyEditorCollection>();
             composition.RegisterUnique<ParameterEditorCollection>();
 
+            // TODO: WB Add our collection
+            // Manually register stuff in this collection
+            composition.DataValueReferences();
+
             // register a server registrar, by default it's the db registrar
             composition.RegisterUnique<IServerRegistrar>(f =>
             {
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 225317943b..c6545a4f8b 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -281,6 +281,8 @@
     <Compile Include="Models\PublishedContent\IPublishedContentType.cs" />
     <Compile Include="Models\PublishedContent\IPublishedPropertyType.cs" />
     <Compile Include="PropertyEditors\ConfigurationFieldsExtensions.cs" />
+    <Compile Include="PropertyEditors\DataValueReferenceCollection.cs" />
+    <Compile Include="PropertyEditors\DataValueReferenceCollectionBuilder.cs" />
     <Compile Include="PropertyEditors\IDataValueReference.cs" />
     <Compile Include="PropertyEditors\IIgnoreUserStartNodesConfig.cs" />
     <Compile Include="PublishedContentExtensions.cs" />
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index 5be5e45ecd..1363d60b8a 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -182,6 +182,8 @@ namespace Umbraco.Web.Composing
 
         public static DataEditorCollection DataEditors => CoreCurrent.DataEditors;
 
+        public static DataValueReferenceCollection DataValueReferences => CoreCurrent.DataValueReferences;
+
         public static PropertyEditorCollection PropertyEditors => CoreCurrent.PropertyEditors;
 
         public static ParameterEditorCollection ParameterEditors => CoreCurrent.ParameterEditors;