Merge branch 'main' into feat/upgrade-oai

baywet · baywet · commit 769bdd0ff2bf · 2025-04-01T14:35:11.000-04:00
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
@@ -702,8 +702,9 @@ private void CreateAlternateKeyPath(ODataPath currentPath, IEdmEntityType entity
             IEnumerable<IDictionary<string, IEdmProperty>> alternateKeys = _model.GetAlternateKeysAnnotation(entityType);
             foreach (var keyDict in alternateKeys)
             {
+                if (keyDict.Where(static x => x.Value is not null).ToDictionary(static k => k.Key, static v => v.Value.Name) is not { Count: > 0 } keyMappings)
+                    continue;
                 ODataPath keyPath = currentPath.Clone();
-                IDictionary<string, string> keyMappings = keyDict.ToDictionary(static k => k.Key, static v => v.Value.Name);
                 ODataKeySegment keySegment = new(entityType, keyMappings)
                 {
                     IsAlternateKey = true

Original file line number	Diff line number	Diff line change
`@@ -702,8 +702,9 @@ private void CreateAlternateKeyPath(ODataPath currentPath, IEdmEntityType entity`
`702`	`702`	`IEnumerable<IDictionary<string, IEdmProperty>> alternateKeys = _model.GetAlternateKeysAnnotation(entityType);`
`703`	`703`	`foreach (var keyDict in alternateKeys)`
`704`	`704`	`{`
	`705`	`+ if (keyDict.Where(static x => x.Value is not null).ToDictionary(static k => k.Key, static v => v.Value.Name) is not { Count: > 0 } keyMappings)`
	`706`	`+ continue;`
`705`	`707`	`ODataPath keyPath = currentPath.Clone();`
`706`		`- IDictionary<string, string> keyMappings = keyDict.ToDictionary(static k => k.Key, static v => v.Value.Name);`
`707`	`708`	`ODataKeySegment keySegment = new(entityType, keyMappings)`
`708`	`709`	`{`
`709`	`710`	`IsAlternateKey = true`