chore: rename OpenApiAny to JsonNodeExtension

docs/upgrade-guide-2.md

@@ -203,7 +203,7 @@ var openApiObject = new OpenApiObject
     }
 };
 var parameter = new OpenApiParameter();
-parameter.Extensions.Add("x-foo", new OpenApiAny(openApiObject));
+parameter.Extensions.Add("x-foo", new JsonNodeExtension(openApiObject));
 
 ```
 
@@ -223,7 +223,7 @@ var openApiObject = new JsonObject
     }
 };
 var parameter = new OpenApiParameter();
-parameter.Extensions.Add("x-foo", new OpenApiAny(openApiObject));
+parameter.Extensions.Add("x-foo", new JsonNodeExtension(openApiObject));
 
 ```
 

src/Microsoft.OpenApi.Hidi/Extensions/OpenApiExtensibleExtensions.cs

@@ -1,4 +1,4 @@
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
@@ -15,7 +15,7 @@ internal static class OpenApiExtensibleExtensions
         /// <returns>A <see cref="string"/> value matching the provided extensionKey. Return null when extensionKey is not found. </returns>
         internal static string GetExtension(this Dictionary<string, IOpenApiExtension> extensions, string extensionKey)
         {
-            if (extensions.TryGetValue(extensionKey, out var value) && value is OpenApiAny { Node: JsonValue castValue } && castValue.TryGetValue<string>(out var stringValue))
+            if (extensions.TryGetValue(extensionKey, out var value) && value is JsonNodeExtension { Node: JsonValue castValue } && castValue.TryGetValue<string>(out var stringValue))
             {
                 return stringValue;
             }

src/Microsoft.OpenApi/Any/OpenApiAny.cs → src/Microsoft.OpenApi/Extensions/JsonNodeExtension.cs

@@ -5,20 +5,20 @@
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Any
+namespace Microsoft.OpenApi.Extensions
 {
     /// <summary>
     /// A wrapper class for JsonNode
     /// </summary>
-    public class OpenApiAny : IOpenApiElement, IOpenApiExtension
+    public class JsonNodeExtension : IOpenApiElement, IOpenApiExtension
     {
         private readonly JsonNode jsonNode;
 
         /// <summary>
-        /// Initializes the <see cref="OpenApiAny"/> class.
+        /// Initializes the <see cref="JsonNodeExtension"/> class.
         /// </summary>
         /// <param name="jsonNode"></param>
-        public OpenApiAny(JsonNode jsonNode)
+        public JsonNodeExtension(JsonNode jsonNode)
         {
             this.jsonNode = jsonNode;
         }
@@ -29,7 +29,7 @@ public OpenApiAny(JsonNode jsonNode)
         public JsonNode Node { get { return jsonNode; } }
 
         /// <summary>
-        /// Writes out the OpenApiAny type.
+        /// Writes out the JsonNodeExtension type.
         /// </summary>
         /// <param name="writer"></param>
         /// <param name="specVersion"></param>

src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiDeprecationExtension.cs

@@ -5,7 +5,6 @@
 
 using System;
 using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 using System.Text.Json.Nodes;
@@ -103,7 +102,7 @@ jsonNode is not JsonValue jsonValue ||
         return null;
     }
     /// <summary>
-    /// Parses the <see cref="OpenApiAny"/> to <see cref="OpenApiDeprecationExtension"/>.
+    /// Parses the <see cref="JsonNodeExtension"/> to <see cref="OpenApiDeprecationExtension"/>.
     /// </summary>
     /// <param name="source">The source object.</param>
     /// <returns>The <see cref="OpenApiDeprecationExtension"/>.</returns>

src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtension.cs

@@ -5,7 +5,7 @@
 
 using System;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -34,7 +34,7 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
     public bool IsPrimaryErrorMessage { get; set; }
 
     /// <summary>
-    /// Parses the <see cref="OpenApiAny"/> to <see cref="OpenApiPrimaryErrorMessageExtension"/>.
+    /// Parses the <see cref="JsonNodeExtension"/> to <see cref="OpenApiPrimaryErrorMessageExtension"/>.
     /// </summary>
     /// <param name="source">The source object.</param>
     /// <returns>The <see cref="OpenApiPrimaryErrorMessageExtension"/>.</returns>

src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiReservedParameterExtension.cs

@@ -5,7 +5,7 @@
 
 using System;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -35,7 +35,7 @@ public bool? IsReserved
         get; set;
     }
     /// <summary>
-    /// Parses the <see cref="OpenApiAny"/> to <see cref="OpenApiReservedParameterExtension"/>.
+    /// Parses the <see cref="JsonNodeExtension"/> to <see cref="OpenApiReservedParameterExtension"/>.
     /// </summary>
     /// <param name="source">The source object.</param>
     /// <returns>The <see cref="OpenApiReservedParameterExtension"/>.</returns>

src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -110,7 +109,7 @@
             // Clone extensions so we can remove the x-bodyName extensions from the output V2 model.
             if (bodyParameter.Extensions is not null && 
                 bodyParameter.Extensions.TryGetValue(OpenApiConstants.BodyName, out var bodyNameExtension) &&
-                bodyNameExtension is OpenApiAny bodyName)
+                bodyNameExtension is JsonNodeExtension bodyName)
             {
                 bodyParameter.Name = string.IsNullOrEmpty(bodyName.Node.ToString()) ? "body" : bodyName.Node.ToString();
                 bodyParameter.Extensions.Remove(OpenApiConstants.BodyName);
@@ -137,7 +136,7 @@
                         {
                             OpenApiSchema s => s, // we already have a copy
                                                   // we have a copy of a reference but don't want to mutate the source schema
                                                   // TODO might need recursive resolution of references here
                             OpenApiSchemaReference r when r.Target is not null => (OpenApiSchema)r.Target.CreateShallowCopy(),
                             OpenApiSchemaReference => throw new InvalidOperationException("Unresolved reference target"),
                             _ => throw new InvalidOperationException("Unexpected schema type")

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
@@ -755,7 +754,7 @@ private void SerializeTypeProperty(JsonSchemaType? type, IOpenApiWriter writer,
             var isNullable = (Type.HasValue && Type.Value.HasFlag(JsonSchemaType.Null)) ||
                                 Extensions is not null &&
                                 Extensions.TryGetValue(OpenApiConstants.NullableExtension, out var nullExtRawValue) &&
-                                nullExtRawValue is OpenApiAny { Node: JsonNode jsonNode } &&
+                                nullExtRawValue is JsonNodeExtension { Node: JsonNode jsonNode } &&
                                 jsonNode.GetValueKind() is JsonValueKind.True;
             if (type is null)
             {

src/Microsoft.OpenApi/Reader/ParseNodes/AnyMapFieldMapParameter.cs

@@ -27,7 +27,7 @@ public AnyMapFieldMapParameter(
         }
 
         /// <summary>
-        /// Function to retrieve the property that is a map from string to an inner element containing IOpenApiAny.
+        /// Function to retrieve the property that is a map from string to an inner element.
         /// </summary>
         public Func<T, Dictionary<string, U>?> PropertyMapGetter { get; }
 

src/Microsoft.OpenApi/Reader/ParseNodes/MapNode.cs

@@ -9,8 +9,8 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Exceptions;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.Reader.ParseNodes
@@ -191,7 +191,7 @@ public override string GetRaw()
         }
 
         /// <summary>
-        /// Create an <see cref="OpenApiAny"/>
+        /// Create an <see cref="JsonNodeExtension"/>
         /// </summary>
         /// <returns>The created Json object.</returns>
         public override JsonNode CreateAny()

src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs

@@ -3,14 +3,12 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader.ParseNodes;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Models.Interfaces;
 using System;
-using Microsoft.OpenApi.Interfaces;
 
 namespace Microsoft.OpenApi.Reader.V2
 {
@@ -242,7 +240,7 @@ internal static IOpenApiRequestBody CreateRequestBody(
             if (bodyParameter.Name is not null)
             {
                 requestBody.Extensions ??= [];
-                requestBody.Extensions[OpenApiConstants.BodyName] = new OpenApiAny(bodyParameter.Name);
+                requestBody.Extensions[OpenApiConstants.BodyName] = new JsonNodeExtension(bodyParameter.Name);
             }            
             return requestBody;
         }

src/Microsoft.OpenApi/Reader/V2/OpenApiV2Deserializer.cs

@@ -5,8 +5,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Exceptions;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader.ParseNodes;
@@ -86,7 +86,7 @@ private static IOpenApiExtension LoadExtension(string name, ParseNode node)
             }
             else
             {
-                return new OpenApiAny(node.CreateAny());
+                return new JsonNodeExtension(node.CreateAny());
             }
         }
 

src/Microsoft.OpenApi/Reader/V2/OpenApiV2VersionService.cs

@@ -3,8 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Exceptions;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Properties;
@@ -31,7 +31,7 @@ public OpenApiV2VersionService(OpenApiDiagnostic diagnostic)
 
         private readonly Dictionary<Type, Func<ParseNode, OpenApiDocument, object?>> _loaders = new()
         {
-            [typeof(OpenApiAny)] = OpenApiV2Deserializer.LoadAny,
+            [typeof(JsonNodeExtension)] = OpenApiV2Deserializer.LoadAny,
             [typeof(OpenApiContact)] = OpenApiV2Deserializer.LoadContact,
             [typeof(OpenApiExternalDocs)] = OpenApiV2Deserializer.LoadExternalDocs,
             [typeof(OpenApiHeader)] = OpenApiV2Deserializer.LoadHeader,

src/Microsoft.OpenApi/Reader/V3/OpenApiV3Deserializer.cs

@@ -5,9 +5,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Expressions;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader.ParseNodes;
@@ -131,9 +131,9 @@ private static RuntimeExpressionAnyWrapper LoadRuntimeExpressionAnyWrapper(Parse
             };
         }
 
-        public static OpenApiAny LoadAny(ParseNode node, OpenApiDocument hostDocument)
+        public static JsonNodeExtension LoadAny(ParseNode node, OpenApiDocument hostDocument)
         {
-            return new OpenApiAny(node.CreateAny());
+            return new JsonNodeExtension(node.CreateAny());
         }
 
         private static IOpenApiExtension LoadExtension(string name, ParseNode node)
@@ -145,7 +145,7 @@ private static IOpenApiExtension LoadExtension(string name, ParseNode node)
             }
             else
             {
-                return new OpenApiAny(node.CreateAny());
+                return new JsonNodeExtension(node.CreateAny());
             }
         }
 

src/Microsoft.OpenApi/Reader/V3/OpenApiV3VersionService.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -19,7 +19,7 @@
     {
         public OpenApiDiagnostic Diagnostic { get; }
 
         private static readonly char[] _pathSeparator = new char[] { '/' };
 
         /// <summary>
         /// Create Parsing Context
@@ -32,7 +32,7 @@
 
         private readonly Dictionary<Type, Func<ParseNode, OpenApiDocument, object>> _loaders = new()
         {
-            [typeof(OpenApiAny)] = OpenApiV3Deserializer.LoadAny,
+            [typeof(JsonNodeExtension)] = OpenApiV3Deserializer.LoadAny,
             [typeof(OpenApiCallback)] = OpenApiV3Deserializer.LoadCallback,
             [typeof(OpenApiComponents)] = OpenApiV3Deserializer.LoadComponents,
             [typeof(OpenApiContact)] = OpenApiV3Deserializer.LoadContact,

src/Microsoft.OpenApi/Reader/V31/OpenApiV31Deserializer.cs

@@ -4,9 +4,9 @@
 using System;
 using System.Linq;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Expressions;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader.ParseNodes;
@@ -139,7 +139,7 @@ private static IOpenApiExtension LoadExtension(string name, ParseNode node)
         {
             return node.Context.ExtensionParsers is not null && node.Context.ExtensionParsers.TryGetValue(name, out var parser)
                 ? parser(node.CreateAny(), OpenApiSpecVersion.OpenApi3_1)
-                : new OpenApiAny(node.CreateAny());
+                : new JsonNodeExtension(node.CreateAny());
         }
 
         private static string? LoadString(ParseNode node)

src/Microsoft.OpenApi/Reader/V31/OpenApiV31VersionService.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -31,7 +31,7 @@ public OpenApiV31VersionService(OpenApiDiagnostic diagnostic)
 
         private readonly Dictionary<Type, Func<ParseNode, OpenApiDocument, object>> _loaders = new Dictionary<Type, Func<ParseNode, OpenApiDocument, object>>
         {
-            [typeof(OpenApiAny)] = OpenApiV31Deserializer.LoadAny,
+            [typeof(JsonNodeExtension)] = OpenApiV31Deserializer.LoadAny,
             [typeof(OpenApiCallback)] = OpenApiV31Deserializer.LoadCallback,
             [typeof(OpenApiComponents)] = OpenApiV31Deserializer.LoadComponents,
             [typeof(OpenApiContact)] = OpenApiV31Deserializer.LoadContact,

src/Microsoft.OpenApi/Services/OpenApiWalker.cs

@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Net.Http;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
@@ -72,7 +71,7 @@
             _visitor.Visit(tags);
 
             // Visit tags
             if (tags != null)
             {
                 var tagsAsArray = tags.ToArray();
                 for (var i = 0; i < tagsAsArray.Length; i++)
@@ -95,7 +94,7 @@
             _visitor.Visit(tags);
 
             // Visit tags
             if (tags != null)
             {
                 var referencesAsArray = tags.ToArray();
                 for (var i = 0; i < referencesAsArray.Length; i++)
@@ -133,7 +132,7 @@
         /// <summary>
         /// Visits <see cref="OpenApiComponents"/> and child objects
         /// </summary>
         internal void Walk(OpenApiComponents? components)
         {
             if (components == null)
             {
@@ -268,7 +267,7 @@
             _visitor.Visit(paths);
 
             // Visit Paths
             if (paths != null)
             {
                 foreach (var pathItem in paths)
                 {
@@ -293,7 +292,7 @@
             _visitor.Visit(webhooks);
 
             // Visit Webhooks
             if (webhooks != null)
             {
                 foreach (var pathItem in webhooks)
                 {
@@ -465,7 +464,7 @@
                 return;
             }
 
             if (tag is IOpenApiReferenceHolder openApiReferenceHolder)
             {
                 Walk(openApiReferenceHolder);
             }
@@ -498,7 +497,7 @@
 
             _visitor.Visit(serverVariables);
 
             if (serverVariables != null)
             {
                 foreach (var variable in serverVariables)
                 {
@@ -965,7 +964,7 @@
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiAny"/> and child objects
+        /// Visits <see cref="JsonNodeExtension"/> and child objects
         /// </summary>
         internal void Walk(JsonNode? example)
         {

src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs

@@ -6,13 +6,13 @@
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 
 namespace Microsoft.OpenApi.Writers
 {
     /// <summary>
-    /// Extensions methods for writing the <see cref="OpenApiAny"/>
+    /// Extensions methods for writing the <see cref="JsonNodeExtension"/>
     /// </summary>
     public static class OpenApiWriterAnyExtensions
     {
@@ -114,7 +114,7 @@
 
         private static void WritePrimitive(this IOpenApiWriter writer, JsonValue jsonValue)
         {
             if (jsonValue.TryGetValue(out string? stringValue) && stringValue is not null)
                 writer.WriteValue(stringValue);
             else if (jsonValue.TryGetValue(out DateTime dateTimeValue))
                 writer.WriteValue(dateTimeValue.ToString("o", CultureInfo.InvariantCulture)); // ISO 8601 format

test/Microsoft.OpenApi.Hidi.Tests/Formatters/PowerShellFormatterTests.cs

@@ -1,8 +1,6 @@
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Hidi.Formatters;
-using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Services;
 using Xunit;
 
@@ -147,7 +145,7 @@ private static OpenApiDocument GetSampleOpenApiDocument()
                                         Extensions = new()
                                         {
                                             {
-                                                "x-ms-docs-operation-type", new OpenApiAny("function")
+                                                "x-ms-docs-operation-type", new JsonNodeExtension("function")
                                             }
                                         }
                                     }