Update value converter and mark MultiUrls as obsolete

Author: rasmusjp

src/RJP.MultiUrlPicker/Models/MultiUrls.cs

@@ -5,33 +5,51 @@
 using Newtonsoft.Json.Linq;
 
 using Umbraco.Core.Logging;
+using System;
 
 namespace RJP.MultiUrlPicker.Models
 {
+    [Obsolete("Use IEnumerable<Link> instead")]
     public class MultiUrls : IEnumerable<Link>
     {
         private readonly string _propertyData;
         private readonly List<Link> _multiUrls = new List<Link>(); 
 
+        internal MultiUrls()
+        {
+        }
+
+        internal MultiUrls(JArray propertyData)
+        {
+            _propertyData = propertyData.ToString();
+
+            Initialize(propertyData);
+        }
+
         public MultiUrls(string propertyData)
         {
             _propertyData = propertyData;
 
             if (!string.IsNullOrEmpty(propertyData))
             {
                 var relatedLinks = JsonConvert.DeserializeObject<JArray>(propertyData);
-                foreach (var item in relatedLinks)
+                Initialize(relatedLinks);
+            }
+        }
+
+        private void Initialize(JArray data)
+        {
+            foreach (var item in data)
+            {
+                var newLink = new Link(item);
+                if (!newLink.Deleted)
+                {
+                    _multiUrls.Add(new Link(item));
+                }
+                else
                 {
-                    var newLink = new Link(item);
-                    if (!newLink.Deleted)
-                    {
-                        _multiUrls.Add(new Link(item));
-                    }
-                    else
-                    {
-                        LogHelper.Warn<MultiUrls>(
-                            string.Format("MultiUrlPicker value converter skipped a link as the node has been upublished/deleted (Id: {0}), ", newLink.Id));
-                    }
+                    LogHelper.Warn<MultiUrls>(
+                        string.Format("MultiUrlPicker value converter skipped a link as the node has been upublished/deleted (Id: {0}), ", newLink.Id));
                 }
             }
         }

src/RJP.MultiUrlPicker/MultiUrlPickerValueConverter.cs

@@ -1,25 +1,42 @@
-using Umbraco.Core.Models.PublishedContent;
+using System.Collections.Generic;
+
+using Newtonsoft.Json.Linq;
+
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
-using Umbraco.Web;
 
 using RJP.MultiUrlPicker.Models;
 
 namespace RJP.MultiUrlPicker
 {
-    [PropertyValueType(typeof(MultiUrls))]
-    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
+    [PropertyValueType(typeof(IEnumerable<Link>))]
+    [PropertyValueCache(PropertyCacheValue.Source, PropertyCacheLevel.Content)]
+    [PropertyValueCache(PropertyCacheValue.Object, PropertyCacheLevel.ContentCache)]
+    [PropertyValueCache(PropertyCacheValue.XPath, PropertyCacheLevel.ContentCache)]
     public class MultiUrlPickerValueConverter : PropertyValueConverterBase
     {
         public override bool IsConverter(PublishedPropertyType propertyType)
         {
             return propertyType.PropertyEditorAlias.Equals("RJP.MultiUrlPicker");
         }
+
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
-            if (source == null) return null;
-            var sourceString = source.ToString();
+            if (source == null)
+            {
+                return null;
+            }
+            return JArray.Parse(source.ToString());
+        }
+
+        public override object ConvertSourceToObject(PublishedPropertyType propertyType, object source, bool preview)
+        {
+            if (source == null)
+            {
+                return new MultiUrls();
+            }
 
-            return UmbracoContext.Current != null ? new MultiUrls(sourceString) : null;
+            return new MultiUrls((JArray)source);
         }
     }
 }