CodeQL warnings (#97)

destructurama · Jan 24, 2024 · 6e12414 · 6e12414
1 parent fe670de
commit 6e12414
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/src/Destructurama.Attributed/Attributed/AttributedDestructuringPolicy.cs b/src/Destructurama.Attributed/Attributed/AttributedDestructuringPolicy.cs
@@ -71,11 +71,8 @@ private CacheEntry CreateCacheEntry(Type type)
             .Where(o => o.Attribute != null)
             .ToDictionary(o => o.pi, o => o.Attribute);
 
-        if (_options.IgnoreNullProperties && !optionalIgnoreAttributes.Any() && !destructuringAttributes.Any())
-        {
-            if (typeof(IEnumerable).IsAssignableFrom(type))
-                return CacheEntry.Ignore;
-        }
+        if (_options.IgnoreNullProperties && !optionalIgnoreAttributes.Any() && !destructuringAttributes.Any() && typeof(IEnumerable).IsAssignableFrom(type))
+            return CacheEntry.Ignore;
 
         return new CacheEntry((o, f) => MakeStructure(o, properties, optionalIgnoreAttributes, destructuringAttributes, f, type));
     }
@@ -93,17 +90,11 @@ private LogEventPropertyValue MakeStructure(
         {
             var propValue = SafeGetPropValue(o, pi);
 
-            if (optionalIgnoreAttributes.TryGetValue(pi, out var optionalIgnoreAttribute))
-            {
-                if (optionalIgnoreAttribute.ShouldPropertyBeIgnored(pi.Name, propValue, pi.PropertyType))
-                    continue;
-            }
+            if (optionalIgnoreAttributes.TryGetValue(pi, out var optionalIgnoreAttribute) && optionalIgnoreAttribute.ShouldPropertyBeIgnored(pi.Name, propValue, pi.PropertyType))
+                continue;
 
-            if (_options.IgnoreNullProperties)
-            {
-                if (NotLoggedIfNullAttribute.Instance.ShouldPropertyBeIgnored(pi.Name, propValue, pi.PropertyType))
-                    continue;
-            }
+            if (_options.IgnoreNullProperties && NotLoggedIfNullAttribute.Instance.ShouldPropertyBeIgnored(pi.Name, propValue, pi.PropertyType))
+                continue;
 
             if (destructuringAttributes.TryGetValue(pi, out var destructuringAttribute))
             {