Switch from ContainsKey to TryGetValue per pull request comment

OData · Sep 25, 2023 · 83cb640 · 83cb640
1 parent d83eeb6
commit 83cb640
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.cs b/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.cs
@@ -2444,8 +2444,15 @@ internal void WritePropertiesForSingleType(IEnumerable<IEdmProperty> properties)
         foreach (IEdmProperty property in properties.Where(i => i.PropertyKind == EdmPropertyKind.Navigation))
         {
             string propertyType;
-            string propertyName = IdentifierMappings.ContainsKey(property.Name) ?
-                IdentifierMappings[property.Name] : (this.context.EnableNamingAlias ? Customization.CustomizeNaming(property.Name) : property.Name);
+            string propertyName;
+            if (IdentifierMappings.TryGetValue(property.Name, out var mappedPropertyName))
+            {
+                propertyName = mappedPropertyName;
+            }
+            else
+            {
+                propertyName = this.context.EnableNamingAlias ? Customization.CustomizeNaming(property.Name) : property.Name;
+            }
 
             if (property.Type is Microsoft.OData.Edm.EdmCollectionTypeReference)
             {

diff --git a/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.ttinclude b/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.ttinclude
@@ -2302,8 +2302,15 @@ public abstract class ODataClientTemplate : TemplateBase
         foreach (IEdmProperty property in properties.Where(i => i.PropertyKind == EdmPropertyKind.Navigation))
         {
             string propertyType;
-            string propertyName = IdentifierMappings.ContainsKey(property.Name) ?
-                IdentifierMappings[property.Name] : (this.context.EnableNamingAlias ? Customization.CustomizeNaming(property.Name) : property.Name);
+            string propertyName;
+            if (IdentifierMappings.TryGetValue(property.Name, out var mappedPropertyName))
+            {
+                propertyName = mappedPropertyName;
+            }
+            else
+            {
+                propertyName = this.context.EnableNamingAlias ? Customization.CustomizeNaming(property.Name) : property.Name;
+            }
 
             if (property.Type is Microsoft.OData.Edm.EdmCollectionTypeReference)
             {