From e6e8884093e95e863eb6391ed5325612ef051865 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 23 Aug 2021 15:20:58 +0200
Subject: [PATCH] Revert "optimized usage of Reflection in ValidationHelper"
This reverts commit fdb933b4ef8238e4325b2956e5158ed65b792da1.
---
VectoCommon/VectoCommon/Utils/Validation.cs | 32 +++++++--------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/VectoCommon/VectoCommon/Utils/Validation.cs b/VectoCommon/VectoCommon/Utils/Validation.cs
index 0f8a09e0fa..ebfe5f6b5d 100644
--- a/VectoCommon/VectoCommon/Utils/Validation.cs
+++ b/VectoCommon/VectoCommon/Utils/Validation.cs
@@ -114,31 +114,19 @@ namespace TUGraz.VectoCommon.Utils
const BindingFlags flags =
BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public |
BindingFlags.FlattenHierarchy;
-
- if (m.MemberType == MemberTypes.Property) {
- PropertyInfo prop = m as PropertyInfo ?? obj.GetProperty(m.Name, flags);
- //var prop = obj.GetProperty(m.Name, flags);
- if (prop != null)
- {
- //if (m is PropertyInfo prop) {
- attributes = prop.GetCustomAttributes(typeof(T))
- .Cast<T>()
- .Concat(obj.GetInterfaces().SelectMany(m.GetAttributes<T>));
- }
+ var prop = obj.GetProperty(m.Name, flags);
+ if (prop != null) {
+ attributes = prop.GetCustomAttributes(typeof(T))
+ .Cast<T>()
+ .Concat(obj.GetInterfaces().SelectMany(m.GetAttributes<T>));
}
- if (m.MemberType == MemberTypes.Field) {
- FieldInfo field = m as FieldInfo ?? obj.GetField(m.Name, flags);
- //var field = obj.GetField(m.Name, flags);
- if (field != null)
- {
- //if (m is FieldInfo field) {
- attributes =
- attributes.Concat(
- field.GetCustomAttributes(typeof(T)).Cast<T>().Concat(obj.GetInterfaces().SelectMany(m.GetAttributes<T>)));
- }
+ var field = obj.GetField(m.Name, flags);
+ if (field != null) {
+ attributes =
+ attributes.Concat(
+ field.GetCustomAttributes(typeof(T)).Cast<T>().Concat(obj.GetInterfaces().SelectMany(m.GetAttributes<T>)));
}
-
return attributes;
}
--
GitLab