chore: refactors the extension parsing to live in extensions

baywet · baywet · commit 9877815facd1 · 2025-09-30T16:43:16.000-04:00
Signed-off-by: Vincent Biret &lt;vibiret@microsoft.com&gt;
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiOAuthFlowDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiOAuthFlowDeserializer.cs
@@ -48,24 +48,27 @@ internal static partial class OpenApiV3Deserializer
                         }
                     }
                 },
+                {"scopes", (o, n, _) => o.Scopes = n.CreateSimpleMap(LoadString).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}
+            };
+
+        private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) =>
                 {
-                    "x-oai-deviceAuthorizationUrl",
-                    (o, n, _) =>
+                    if (p.Equals("x-oai-deviceAuthorizationUrl", StringComparison.OrdinalIgnoreCase))
                     {
                         var url = n.GetScalarValue();
                         if (url != null)
                         {
                             o.DeviceAuthorizationUrl = new(url, UriKind.RelativeOrAbsolute);
                         }
                     }
-                },
-                {"scopes", (o, n, _) => o.Scopes = n.CreateSimpleMap(LoadString).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}
-            };
-
-        private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =
-            new()
-            {
-                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))}
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n));
+                    }
+                }}
             };
 
         public static OpenApiOAuthFlow LoadOAuthFlow(ParseNode node, OpenApiDocument hostDocument)
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiOAuthFlowDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiOAuthFlowDeserializer.cs
@@ -45,24 +45,27 @@ internal static partial class OpenApiV31Deserializer
                         }
                     }
                 },
+                {"scopes", (o, n, _) => o.Scopes = n.CreateSimpleMap(LoadString).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}
+            };
+
+        private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) =>
                 {
-                    "x-oai-deviceAuthorizationUrl",
-                    (o, n, _) =>
+                    if (p.Equals("x-oai-deviceAuthorizationUrl", StringComparison.OrdinalIgnoreCase))
                     {
                         var url = n.GetScalarValue();
                         if (url != null)
                         {
                             o.DeviceAuthorizationUrl = new(url, UriKind.RelativeOrAbsolute);
                         }
                     }
-                },
-                {"scopes", (o, n, _) => o.Scopes = n.CreateSimpleMap(LoadString).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}
-            };
-
-        private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =
-            new()
-            {
-                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))}
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n));
+                    }
+                }}
             };
 
         public static OpenApiOAuthFlow LoadOAuthFlow(ParseNode node, OpenApiDocument hostDocument)

Original file line number	Diff line number	Diff line change
`@@ -48,24 +48,27 @@ internal static partial class OpenApiV3Deserializer`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`},`
	`51`	`+ {"scopes", (o, n, _) => o.Scopes = n.CreateSimpleMap(LoadString).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}`
	`52`	`+ };`
	`53`	`+`
	`54`	`+ private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =`
	`55`	`+ new()`
	`56`	`+ {`
	`57`	`+ {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) =>`
`51`	`58`	`{`
`52`		`- "x-oai-deviceAuthorizationUrl",`
`53`		`- (o, n, _) =>`
	`59`	`+ if (p.Equals("x-oai-deviceAuthorizationUrl", StringComparison.OrdinalIgnoreCase))`
`54`	`60`	`{`
`55`	`61`	`var url = n.GetScalarValue();`
`56`	`62`	`if (url != null)`
`57`	`63`	`{`
`58`	`64`	`o.DeviceAuthorizationUrl = new(url, UriKind.RelativeOrAbsolute);`
`59`	`65`	`}`
`60`	`66`	`}`
`61`		`- },`
`62`		`- {"scopes", (o, n, _) => o.Scopes = n.CreateSimpleMap(LoadString).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}`
`63`		`- };`
`64`		`-`
`65`		`- private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =`
`66`		`- new()`
`67`		`- {`
`68`		`- {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))}`
	`67`	`+ else`
	`68`	`+ {`
	`69`	`+ o.AddExtension(p, LoadExtension(p, n));`
	`70`	`+ }`
	`71`	`+ }}`
`69`	`72`	`};`
`70`	`73`
`71`	`74`	`public static OpenApiOAuthFlow LoadOAuthFlow(ParseNode node, OpenApiDocument hostDocument)`
Original file line number	Diff line number	Diff line change
`@@ -45,24 +45,27 @@ internal static partial class OpenApiV31Deserializer`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`},`
	`48`	`+ {"scopes", (o, n, _) => o.Scopes = n.CreateSimpleMap(LoadString).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}`
	`49`	`+ };`
	`50`	`+`
	`51`	`+ private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =`
	`52`	`+ new()`
	`53`	`+ {`
	`54`	`+ {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) =>`
`48`	`55`	`{`
`49`		`- "x-oai-deviceAuthorizationUrl",`
`50`		`- (o, n, _) =>`
	`56`	`+ if (p.Equals("x-oai-deviceAuthorizationUrl", StringComparison.OrdinalIgnoreCase))`
`51`	`57`	`{`
`52`	`58`	`var url = n.GetScalarValue();`
`53`	`59`	`if (url != null)`
`54`	`60`	`{`
`55`	`61`	`o.DeviceAuthorizationUrl = new(url, UriKind.RelativeOrAbsolute);`
`56`	`62`	`}`
`57`	`63`	`}`
`58`		`- },`
`59`		`- {"scopes", (o, n, _) => o.Scopes = n.CreateSimpleMap(LoadString).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}`
`60`		`- };`
`61`		`-`
`62`		`- private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =`
`63`		`- new()`
`64`		`- {`
`65`		`- {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))}`
	`64`	`+ else`
	`65`	`+ {`
	`66`	`+ o.AddExtension(p, LoadExtension(p, n));`
	`67`	`+ }`
	`68`	`+ }}`
`66`	`69`	`};`
`67`	`70`
`68`	`71`	`public static OpenApiOAuthFlow LoadOAuthFlow(ParseNode node, OpenApiDocument hostDocument)`