Merge pull request #223 from PHOENIXCONTACT/fix/proxy-null-reference

Fix NullReference exceptions in ResourceProxy
PHOENIXCONTACT · Feb 20, 2024 · 752897d · 752897d
2 parents 9af4aca + ceeff28
commit 752897d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/src/Moryx.Resources.Management/Resources/ResourceProxy.cs b/src/Moryx.Resources.Management/Resources/ResourceProxy.cs
@@ -58,6 +58,8 @@ public override string ToString()
         protected internal TResource Convert<TResource>(IResource instance)
             where TResource : IResource
         {
+            if (instance is null) return default;
+
             return (TResource)_typeController.GetProxy((Resource)instance);
         }
 
@@ -67,6 +69,8 @@ protected internal TResource Convert<TResource>(IResource instance)
         protected internal TResource[] ConvertMany<TResource>(IEnumerable<IResource> instances)
             where TResource : IResource
         {
+            if (instances is null) return default;
+
             return instances.Select(Convert<TResource>).ToArray();
         }
 
@@ -76,6 +80,8 @@ protected internal TResource[] ConvertMany<TResource>(IEnumerable<IResource> ins
         protected internal static TResource Extract<TResource>(IResource instance)
             where TResource : IResource
         {
+            if (instance is null) return default;
+
             var proxy = (ResourceProxy)instance;
             return (TResource)proxy.Target;
         }
@@ -86,6 +92,8 @@ protected internal static TResource Extract<TResource>(IResource instance)
         protected internal static TResource[] ExtractMany<TResource>(IEnumerable<IResource> instances)
             where TResource : IResource
         {
+            if (instances is null) return default;
+
             return instances.Select(Extract<TResource>).ToArray();
         }
     }

diff --git a/src/Tests/Moryx.Resources.Management.Tests/Mocks/ReferenceResource.cs b/src/Tests/Moryx.Resources.Management.Tests/Mocks/ReferenceResource.cs
@@ -13,8 +13,12 @@ public interface IReferenceResource : IPublicResource
     {
         ISimpleResource Reference { get; set; }
 
+        DerivedResource Reference2 { get; set; }
+
         IEnumerable<ISimpleResource> MoreReferences { get; }
 
+        IEnumerable<ISimpleResource> EvenMoreReferences { get; set; }
+
         INonPublicResource NonPublic { get; }
 
         ISimpleResource GetReference();
@@ -72,6 +76,8 @@ public ISimpleResource Reference
 
         IEnumerable<ISimpleResource> IReferenceResource.MoreReferences => References;
 
+        public IEnumerable<ISimpleResource> EvenMoreReferences { get; set; }
+
         public ISimpleResource GetReference()
         {
             return Reference;

diff --git a/src/Tests/Moryx.Resources.Management.Tests/TypeControllerTests.cs b/src/Tests/Moryx.Resources.Management.Tests/TypeControllerTests.cs
@@ -220,6 +220,8 @@ public void ReplaceWithProxy()
             {
                 Id = 8,
                 Reference = ref1,
+                Reference2 = null,
+                EvenMoreReferences = null,
                 NonPublic = nonPub
             };
             instance.References = new ReferenceCollection<ISimpleResource>(instance,
@@ -265,6 +267,11 @@ public void ReplaceWithProxy()
             Assert.AreEqual(instance.Reference, ref2);
             Assert.AreEqual(instance.References.Count, 3);
             Assert.AreEqual(instance.References.ElementAt(1), ref1);
+            // Make sure null references work
+            Assert.DoesNotThrow(() => _ = proxy.Reference2);
+            Assert.DoesNotThrow(() => proxy.Reference2 = null);
+            Assert.DoesNotThrow(() => _ = proxy.EvenMoreReferences);
+            Assert.DoesNotThrow(() => proxy.EvenMoreReferences = null);
         }
 
     }