Update to shorten lookup of binding name attribute

dotnet · Apr 11, 2021 · 76dcdcf · 76dcdcf
1 parent 25e7971
commit 76dcdcf
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/ConfigurationBinder.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/ConfigurationBinder.cs
@@ -596,29 +596,19 @@ private static string GetPropertyName(MemberInfo property)
             // Check for a custom property name used for configuration key binding
             foreach (var attributeData in property.GetCustomAttributesData())
             {
-                if (attributeData.AttributeType != typeof(ConfigurationKeyNameAttribute) ||
-                    attributeData.ConstructorArguments.Count == 0)
+                if (attributeData.AttributeType != typeof(ConfigurationKeyNameAttribute))
                 {
-                    // ConfigurationKeyName expected to have a single string constructor argument
                     continue;
                 }
 
-                var constructorArgument = attributeData.ConstructorArguments.First();
-                if (constructorArgument.ArgumentType != typeof(string) ||
-                    constructorArgument.Value == null)
-                {
-                    // First argument didn't contain the expected string value
-                    break;
-                }
-
-                string name = constructorArgument.Value.ToString();
-                if (!string.IsNullOrWhiteSpace(name))
-                {
-                    return name;
-                }
+                // Assumes ConfiguratKeyName constructor first arg is a string key name
+                string name = attributeData
+                    .ConstructorArguments
+                    .First()
+                    .Value?
+                    .ToString();
 
-                // No custom string "name" provided - we're done here.
-                break;
+                return !string.IsNullOrWhiteSpace(name) ? name : property.Name;
             }
 
             return property.Name;