Merge pull request #34 from Geta/bugfix/local_blocks

Added support for local blocks.

Author: svenrog

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.0.1]
+
+### Fixed
+
+- (Attempted) fix for issue with Lazy loading in ContentDelivery api.
+- Fix for issue with local blocks in `2.0.0`.
+
 ## [2.0.0]
 
 ### Added

src/Geta.Optimizely.GenericLinks.ContentDeliveryApi/GenericLinkPropertyModel.cs

@@ -24,7 +24,7 @@ public GenericLinkPropertyModel(PropertyLinkData<T> propertyLinkData, IUrlResolv
 
     public virtual void Expand(CultureInfo language)
     {
-    }        
+    }
 
     private T GetValue(T link)
     {

src/Geta.Optimizely.GenericLinks/LinkData.cs

@@ -18,9 +18,8 @@ namespace Geta.Optimizely.GenericLinks;
 
 public abstract class LinkData : ILinkData
 {
-    private readonly IDictionary<string, string> _attributes;
-    private readonly IDictionary<string, string> _attributeKeys;
-    private readonly object _pessimisticLock;
+    private readonly Dictionary<string, string> _attributes;
+    private readonly Dictionary<string, string> _attributeKeys;
 
     private bool _isModified;
     private bool _isReadOnly;
@@ -30,7 +29,6 @@ protected LinkData()
     {
         _attributes = new Dictionary<string, string>(4);
         _attributeKeys = new Dictionary<string, string>(4);
-        _pessimisticLock = new object();
     }
 
     [Display(Order = 100)]
@@ -73,6 +71,8 @@ public virtual string? Href
     }
 
     [ScaffoldColumn(false)]
+    [SystemTextJsonIgnore]
+    [NewtonsoftJsonIgnore]
     public virtual IDictionary<string, string> Attributes => _attributes;
 
     [Ignore]
@@ -163,6 +163,9 @@ public virtual object Clone()
     //
     // Value:
     //     true if this property is read only; otherwise, false.
+
+    [SystemTextJsonIgnore]
+    [NewtonsoftJsonIgnore]
     public bool IsReadOnly
     {
         get
@@ -321,15 +324,9 @@ protected virtual string GetAttributeKey(string key)
         if (_attributeKeys.TryGetValue(key, out var attributeKey))
             return attributeKey;
 
-        lock (_pessimisticLock)
-        {
-            if (_attributeKeys.ContainsKey(key))
-                return _attributeKeys[key];
-
-            attributeKey = key.ToCamel();
-            _attributeKeys.Add(key, attributeKey);
+        attributeKey = key.ToCamel();
+        _attributeKeys.TryAdd(key, attributeKey);
 
-            return attributeKey;
-        }
+        return attributeKey;
     }
 }

src/Geta.Optimizely.GenericLinks/LinkDataCollection.cs

@@ -15,7 +15,7 @@ public abstract class LinkDataCollection
     public abstract IEnumerable<ILinkData> GetLinks();
 }
 
-public class LinkDataCollection<TLinkData> : LinkDataCollection, IEnumerable<TLinkData>, IReadOnly<LinkDataCollection<TLinkData>>, ICloneable, IReferenceMap
+public class LinkDataCollection<TLinkData> : LinkDataCollection, IList<TLinkData>, IReadOnly<LinkDataCollection<TLinkData>>, ICloneable, IReferenceMap
     where TLinkData : ILinkData
 {
     private readonly List<TLinkData> _linkCollection;

src/Geta.Optimizely.GenericLinks/PropertyLinkDataCollection.cs

@@ -34,6 +34,7 @@ public abstract class PropertyLinkDataCollection<TLinkData> : PropertyLinkDataCo
     private readonly IUrlResolver _urlResolver;
     private readonly IAttributeSanitizer _attributeSanitizer;
     private readonly ILinkHtmlSerializer _htmlSerializer;
+    private readonly object _lazyLock = new();
 
     private LinkDataCollection<TLinkData>? _linkItemCollection;
 
@@ -130,12 +131,18 @@ public override object? Value
     {
         get
         {
-            if (_linkItemCollection is null)
+            if (!((ILazyProperty)this).HasLazyValue)
+                return _linkItemCollection;
+
+            lock (_lazyLock)
             {
+                if (!((ILazyProperty)this).HasLazyValue)
+                    return _linkItemCollection;
+
                 LoadData(base.LongString);
-            }
 
-            return _linkItemCollection;
+                return _linkItemCollection;
+            }
         }
         set
         {