Correctly handle inheritance of EntrySerializeAttributes

PHOENIXCONTACT · Oct 12, 2023 · 6948a5d · 6948a5d
1 parent e2dcc8a
commit 6948a5d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 40 deletions.
diff --git a/src/Moryx.Resources.Samples/DocumentManager.cs b/src/Moryx.Resources.Samples/DocumentManager.cs
diff --git a/src/Moryx/Serialization/EntryConvert/EntryConvert.cs b/src/Moryx/Serialization/EntryConvert/EntryConvert.cs
@@ -275,12 +275,6 @@ public static Entry EncodeObject(object instance, ICustomSerialization customSer
                 var propertyType = property.PropertyType;
                 if (propertyType == instanceType)
                     continue;
-                if(propertyType == typeof(Object))
-                {
-                    var propertyValue = property.GetValue(instance);
-                    if (propertyValue != null && propertyValue?.GetType() == instanceType)
-                        continue;
-                }
 
                 var convertedProperty = EncodeProperty(property, customSerialization);
 

diff --git a/src/Moryx/Serialization/EntrySerializeSerialization.cs b/src/Moryx/Serialization/EntrySerializeSerialization.cs
@@ -42,9 +42,9 @@ public EntrySerializeSerialization(Type filterBaseType)
         public override IEnumerable<ConstructorInfo> GetConstructors(Type sourceType)
         {
             var constructors = from ctor in base.GetConstructors(sourceType)
-                let mode = EvaluateSerializeMode(ctor)
-                where mode.HasValue && mode.Value == EntrySerializeMode.Always
-                select ctor;
+                               let mode = EvaluateSerializeMode(ctor)
+                               where mode.HasValue && mode.Value == EntrySerializeMode.Always
+                               select ctor;
 
             return constructors;
         }
@@ -54,9 +54,9 @@ public override IEnumerable<MethodInfo> GetMethods(Type sourceType)
         {
             var methods = sourceType.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance).Where(m => !m.IsSpecialName);
             methods = from method in methods
-                let mode = EvaluateSerializeMode(method)
-                where mode.HasValue && mode.Value == EntrySerializeMode.Always
-                select method;
+                      let mode = EvaluateSerializeMode(method)
+                      where mode.HasValue && mode.Value == EntrySerializeMode.Always
+                      select method;
 
             return methods;
         }
@@ -66,14 +66,6 @@ public override IEnumerable<PropertyInfo> GetProperties(Type sourceType)
         {
             var properties = sourceType.GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
                 .Where(BasePropertyFilter).Where(ExplicitPropertyFilter).ToArray();
-            var attributeOnClass = sourceType.GetCustomAttribute<EntrySerializeAttribute>(false);
-            var attributeOnClassOrBaseClass = sourceType.GetCustomAttribute<EntrySerializeAttribute>(true);
-            // to-do: remove this in .net8 and use restriction on the EntrySerializeAttribute
-            //EntrySerialize property on both class and base class
-            if (attributeOnClass != null && attributeOnClassOrBaseClass != null)
-            {
-                properties = properties.Where(property => property.GetCustomAttribute<EntrySerializeAttribute>() != null).ToArray();
-            }
             return EntrySerializeAttributeFilter(sourceType, properties);
         }
 
@@ -154,6 +146,23 @@ private static IEnumerable<PropertyInfo> EntrySerializeAttributeFilter(Type sour
             return properties;
         }
 
+        /// <summary>
+        /// Iterate the inheritance tree and find lowest declaration of the attribute
+        /// </summary>
+        private static EntrySerializeMode? EvaluateSerializeMode(Type attributeProvider)
+        {
+            // If more than 1 is declared, determine the lowest definition as it takes precedence
+            // For each declaration check assignability to determine lower type            
+            var currentType = attributeProvider;
+            EntrySerializeAttribute lowestDeclaration = null;
+            while (currentType != typeof(object))
+            {
+                lowestDeclaration = currentType.GetCustomAttribute<EntrySerializeAttribute>(false) ?? lowestDeclaration;
+                currentType = currentType.BaseType;
+            }
+            return lowestDeclaration?.Mode;
+        }
+
         /// <summary>
         /// Checks if the <see cref="EntrySerializeAttribute"/> is existent and activated
         /// </summary>
@@ -168,7 +177,7 @@ private static PropertyMode EvaluateSerializeMode(PropertyInfo property)
             return new PropertyMode
             {
                 Property = property,
-                Mode = EvaluateSerializeMode((ICustomAttributeProvider)property)
+                Mode = property.GetCustomAttribute<EntrySerializeAttribute>(true)?.Mode
             };
         }
 

diff --git a/src/Tests/Moryx.Tests/Serialization/EntrySerializeDummies.cs b/src/Tests/Moryx.Tests/Serialization/EntrySerializeDummies.cs
@@ -85,8 +85,6 @@ public class EntrySerialize_AlwaysClassAlwaysMember
         [EntrySerialize]
         public int Property2 { get; set; } 
 
-        public object Property => this;
-
         [EntrySerialize]
         public EntrySerialize_AlwaysClassAlwaysMember AnotherProperty { get; set; }
         internal IExplicitInterface ExplicitInterface { get; }