Code clean up

MaggieKimani1 · MaggieKimani1 · commit f3772ee6be8c · 2023-04-26T15:57:36.000+03:00
diff --git a/src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs b/src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs
@@ -1,13 +1,13 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Readers.Interface;
 using Microsoft.OpenApi.Validations;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text.Json.Nodes;
 
 namespace Microsoft.OpenApi.Readers
 {
@@ -49,7 +49,7 @@ public class OpenApiReaderSettings
         /// <summary>
         /// Dictionary of parsers for converting extensions into strongly typed classes
         /// </summary>
-        public Dictionary<string, Func<IOpenApiAny, OpenApiSpecVersion, IOpenApiExtension>> ExtensionParsers { get; set; } = new Dictionary<string, Func<IOpenApiAny, OpenApiSpecVersion, IOpenApiExtension>>();
+        public Dictionary<string, Func<JsonNode, OpenApiSpecVersion, IOpenApiExtension>> ExtensionParsers { get; set; } = new Dictionary<string, Func<JsonNode, OpenApiSpecVersion, IOpenApiExtension>>();
 
         /// <summary>
         /// Rules to use for validating OpenAPI specification.  If none are provided a default set of rules are applied.
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMapParameter.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMapParameter.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. 
 
 using System;
-using Microsoft.OpenApi.Any;
+using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.Readers.ParseNodes
@@ -13,8 +13,8 @@ internal class AnyFieldMapParameter<T>
         /// Constructor.
         /// </summary>
         public AnyFieldMapParameter(
-            Func<T, IOpenApiAny> propertyGetter,
-            Action<T, IOpenApiAny> propertySetter,
+            Func<T, JsonNode> propertyGetter,
+            Action<T, JsonNode> propertySetter,
             Func<T, OpenApiSchema> schemaGetter)
         {
             this.PropertyGetter = propertyGetter;
@@ -25,12 +25,12 @@ public AnyFieldMapParameter(
         /// <summary>
         /// Function to retrieve the value of the property.
         /// </summary>
-        public Func<T, IOpenApiAny> PropertyGetter { get; }
+        public Func<T, JsonNode> PropertyGetter { get; }
 
         /// <summary>
         /// Function to set the value of the property.
         /// </summary>
-        public Action<T, IOpenApiAny> PropertySetter { get; }
+        public Action<T, JsonNode> PropertySetter { get; }
 
         /// <summary>
         /// Function to get the schema to apply to the property.
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMapParameter.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMapParameter.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
+using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.Readers.ParseNodes
@@ -14,8 +14,8 @@ internal class AnyListFieldMapParameter<T>
         /// Constructor
         /// </summary>
         public AnyListFieldMapParameter(
-            Func<T, IList<IOpenApiAny>> propertyGetter,
-            Action<T, IList<IOpenApiAny>> propertySetter,
+            Func<T, IList<JsonNode>> propertyGetter,
+            Action<T, IList<JsonNode>> propertySetter,
             Func<T, OpenApiSchema> schemaGetter)
         {
             this.PropertyGetter = propertyGetter;
@@ -26,12 +26,12 @@ public AnyListFieldMapParameter(
         /// <summary>
         /// Function to retrieve the value of the property.
         /// </summary>
-        public Func<T, IList<IOpenApiAny>> PropertyGetter { get; }
+        public Func<T, IList<JsonNode>> PropertyGetter { get; }
 
         /// <summary>
         /// Function to set the value of the property.
         /// </summary>
-        public Action<T, IList<IOpenApiAny>> PropertySetter { get; }
+        public Action<T, IList<JsonNode>> PropertySetter { get; }
 
         /// <summary>
         /// Function to get the schema to apply to the property.
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyMapFieldMapParameter.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/AnyMapFieldMapParameter.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
+using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 
@@ -16,8 +16,8 @@ internal class AnyMapFieldMapParameter<T, U>
         /// </summary>
         public AnyMapFieldMapParameter(
             Func<T, IDictionary<string, U>> propertyMapGetter,
-            Func<U, IOpenApiAny> propertyGetter,
-            Action<U, IOpenApiAny> propertySetter,
+            Func<U, JsonNode> propertyGetter,
+            Action<U, JsonNode> propertySetter,
             Func<T, OpenApiSchema> schemaGetter)
         {
             this.PropertyMapGetter = propertyMapGetter;
@@ -34,12 +34,12 @@ public AnyMapFieldMapParameter(
         /// <summary>
         /// Function to retrieve the value of the property from an inner element.
         /// </summary>
-        public Func<U, IOpenApiAny> PropertyGetter { get; }
+        public Func<U, JsonNode> PropertyGetter { get; }
 
         /// <summary>
         /// Function to set the value of the property.
         /// </summary>
-        public Action<U, IOpenApiAny> PropertySetter { get; }
+        public Action<U, JsonNode> PropertySetter { get; }
 
         /// <summary>
         /// Function to get the schema to apply to the property.
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/OpenApiAnyConverter.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/OpenApiAnyConverter.cs
@@ -48,7 +48,7 @@ public static JsonNode GetSpecificOpenApiAny(JsonNode jsonNode, OpenApiSchema sc
                 return newObject;
             }
 
-            if (!(jsonNode is JsonValue jsonValue))
+            if (jsonNode is not JsonValue jsonValue)
             {
                 return jsonNode;
             }
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text.Json;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.Exceptions;
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs
@@ -5,11 +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.Models;
 using Microsoft.OpenApi.Readers.Exceptions;
-using SharpYaml.Serialization;
 
 namespace Microsoft.OpenApi.Readers.ParseNodes
 {
@@ -87,7 +85,7 @@ public void ParseField<T>(
             }
         }
 
-        public override IOpenApiAny CreateAny()
+        public override JsonNode CreateAny()
         {
             throw new NotImplementedException();
         }
diff --git a/src/Microsoft.OpenApi.Readers/ParsingContext.cs b/src/Microsoft.OpenApi.Readers/ParsingContext.cs
@@ -24,7 +24,8 @@ public class ParsingContext
         private readonly Dictionary<string, object> _tempStorage = new Dictionary<string, object>();
         private readonly Dictionary<object, Dictionary<string, object>> _scopedTempStorage = new Dictionary<object, Dictionary<string, object>>();
         private readonly Dictionary<string, Stack<string>> _loopStacks = new Dictionary<string, Stack<string>>();
-        internal Dictionary<string, Func<JsonNode, OpenApiSpecVersion, IOpenApiExtension>> ExtensionParsers { get; set; } = new Dictionary<string, Func<IOpenApiAny, OpenApiSpecVersion, IOpenApiExtension>>();
+        internal Dictionary<string, Func<JsonNode, OpenApiSpecVersion, IOpenApiExtension>> ExtensionParsers { get; set; } = 
+            new Dictionary<string, Func<JsonNode, OpenApiSpecVersion, IOpenApiExtension>>();
         internal RootNode RootNode { get; set; }
         internal List<OpenApiTag> Tags { get; private set; } = new List<OpenApiTag>();
         internal Uri BaseUrl { get; set; }
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Any;
+using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
@@ -213,10 +213,10 @@ internal static OpenApiRequestBody CreateRequestBody(
                 Extensions = bodyParameter.Extensions
             };
 
-            requestBody.Extensions[OpenApiConstants.BodyName] = new OpenApiString(bodyParameter.Name);
+            requestBody.Extensions[OpenApiConstants.BodyName] = new ExtensionTypeCaster<string>(bodyParameter.Name);
             return requestBody;
         }
-
+        
         private static OpenApiTag LoadTagByReference(
             ParsingContext context,
             string tagName)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Any;
+using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
@@ -74,7 +74,7 @@ private static void ProcessAnyListFields<T>(
             {
                 try
                 {
-                    var newProperty = new List<IOpenApiAny>();
+                    var newProperty = new List<JsonNode>();
 
                     mapNode.Context.StartObject(anyListFieldName);
 
@@ -143,7 +143,7 @@ private static void ProcessAnyMapFields<T, U>(
             }
         }
 
-        public static IOpenApiAny LoadAny(ParseNode node)
+        public static JsonNode LoadAny(ParseNode node)
         {
             return OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());
         }
@@ -158,7 +158,7 @@ private static IOpenApiExtension LoadExtension(string name, ParseNode node)
             }
             else
             {
-                return OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());
+                return (IOpenApiExtension)OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());
             }
         }
 
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
+using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
@@ -33,7 +33,7 @@ public OpenApiV2VersionService(OpenApiDiagnostic diagnostic)
 
         private IDictionary<Type, Func<ParseNode, object>> _loaders = new Dictionary<Type, Func<ParseNode, object>>
         {
-            [typeof(IOpenApiAny)] = OpenApiV2Deserializer.LoadAny,
+            [typeof(JsonNode)] = OpenApiV2Deserializer.LoadAny,
             [typeof(OpenApiContact)] = OpenApiV2Deserializer.LoadContact,
             [typeof(OpenApiExternalDocs)] = OpenApiV2Deserializer.LoadExternalDocs,
             [typeof(OpenApiHeader)] = OpenApiV2Deserializer.LoadHeader,
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.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.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs
@@ -1,7 +1,6 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs
@@ -4,7 +4,6 @@
 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.Interfaces;
@@ -75,7 +74,7 @@ private static void ProcessAnyListFields<T>(
             {
                 try
                 {
-                    var newProperty = new List<IOpenApiAny>();
+                    var newProperty = new List<JsonNode>();
 
                     mapNode.Context.StartObject(anyListFieldName);
 
@@ -158,12 +157,12 @@ private static RuntimeExpressionAnyWrapper LoadRuntimeExpressionAnyWrapper(Parse
                 };
             }
 
-            //return new RuntimeExpressionAnyWrapper
-            //{
-            //    Any = OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny())
-            //};
+            return new RuntimeExpressionAnyWrapper
+            {
+                //Any = OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny())
+            };
         }
-        
+
         public static JsonNode LoadAny(ParseNode node)
         {
             return OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Any;
+using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
@@ -33,7 +33,7 @@ public OpenApiV3VersionService(OpenApiDiagnostic diagnostic)
 
         private IDictionary<Type, Func<ParseNode, object>> _loaders = new Dictionary<Type, Func<ParseNode, object>>
         {
-            [typeof(IOpenApiAny)] = OpenApiV3Deserializer.LoadAny,
+            [typeof(JsonNode)] = OpenApiV3Deserializer.LoadAny,
             [typeof(OpenApiCallback)] = OpenApiV3Deserializer.LoadCallback,
             [typeof(OpenApiComponents)] = OpenApiV3Deserializer.LoadComponents,
             [typeof(OpenApiContact)] = OpenApiV3Deserializer.LoadContact,
diff --git a/src/Microsoft.OpenApi/Helpers/JsonNodeCloneHelper.cs b/src/Microsoft.OpenApi/Helpers/JsonNodeCloneHelper.cs
@@ -0,0 +1,30 @@
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.OpenApi.Helpers
+{
+    internal class JsonNodeCloneHelper
+    {
+        internal static JsonNode Clone(JsonNode value)
+        {
+            if(value == null)
+            {
+                return null;
+            }
+            
+            var options = new JsonSerializerOptions
+            {
+                ReferenceHandler = ReferenceHandler.IgnoreCycles
+            };
+
+            var jsonString = JsonSerializer.Serialize(value, options);
+            var result = JsonSerializer.Deserialize<JsonNode>(jsonString, options);
+
+            return result;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiExample.cs b/src/Microsoft.OpenApi/Models/OpenApiExample.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Helpers;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -67,7 +68,7 @@ public OpenApiExample(OpenApiExample example)
         {
             Summary = example?.Summary ?? Summary;
             Description = example?.Description ?? Description;
-            Value = example?.Value != null ? new JsonNode(example.Value) : null;
+            Value = JsonNodeCloneHelper.Clone(example?.Value);
             ExternalValue = example?.ExternalValue ?? ExternalValue;
             Extensions = example?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(example.Extensions) : null;
             Reference = example?.Reference != null ? new(example?.Reference) : null;
@@ -160,7 +161,7 @@ private void SerializeInternalWithoutReference(IOpenApiWriter writer, OpenApiSpe
             writer.WriteProperty(OpenApiConstants.Description, Description);
 
             // value
-            writer.WriteOptionalObject(OpenApiConstants.Value, Value, (w, v) => w.WriteAny(v));
+            writer.WriteOptionalObject(OpenApiConstants.Value, (IOpenApiElement)Value, (w, v) => w.WriteAny((JsonNode)v));
 
             // externalValue
             writer.WriteProperty(OpenApiConstants.ExternalValue, ExternalValue);
diff --git a/src/Microsoft.OpenApi/Models/OpenApiHeader.cs b/src/Microsoft.OpenApi/Models/OpenApiHeader.cs
diff --git a/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs b/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs
diff --git a/src/Microsoft.OpenApi/Models/OpenApiParameter.cs b/src/Microsoft.OpenApi/Models/OpenApiParameter.cs
diff --git a/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs b/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
diff --git a/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs b/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static JsonNode GetSpecificOpenApiAny(JsonNode jsonNode, OpenApiSchema sc`
`48`	`48`	`return newObject;`
`49`	`49`	`}`
`50`	`50`
`51`		`- if (!(jsonNode is JsonValue jsonValue))`
	`51`	`+ if (jsonNode is not JsonValue jsonValue)`
`52`	`52`	`{`
`53`	`53`	`return jsonNode;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,9 @@`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using System.Text.Json.Nodes;`
`8`		`-using Microsoft.OpenApi.Any;`
`9`	`8`	`using Microsoft.OpenApi.Exceptions;`
`10`	`9`	`using Microsoft.OpenApi.Models;`
`11`	`10`	`using Microsoft.OpenApi.Readers.Exceptions;`
`12`		`-using SharpYaml.Serialization;`
`13`	`11`
`14`	`12`	`namespace Microsoft.OpenApi.Readers.ParseNodes`
`15`	`13`	`{`
`@@ -87,7 +85,7 @@ public void ParseField<T>(`
`87`	`85`	`}`
`88`	`86`	`}`
`89`	`87`
`90`		`- public override IOpenApiAny CreateAny()`
	`88`	`+ public override JsonNode CreateAny()`
`91`	`89`	`{`
`92`	`90`	`throw new NotImplementedException();`
`93`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using System.Linq;`
`6`		`-using Microsoft.OpenApi.Any;`
	`6`	`+using System.Text.Json.Nodes;`
`7`	`7`	`using Microsoft.OpenApi.Exceptions;`
`8`	`8`	`using Microsoft.OpenApi.Interfaces;`
`9`	`9`	`using Microsoft.OpenApi.Models;`
`@@ -74,7 +74,7 @@ private static void ProcessAnyListFields<T>(`
`74`	`74`	`{`
`75`	`75`	`try`
`76`	`76`	`{`
`77`		`- var newProperty = new List<IOpenApiAny>();`
	`77`	`+ var newProperty = new List<JsonNode>();`
`78`	`78`
`79`	`79`	`mapNode.Context.StartObject(anyListFieldName);`
`80`	`80`
`@@ -143,7 +143,7 @@ private static void ProcessAnyMapFields<T, U>(`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
`146`		`- public static IOpenApiAny LoadAny(ParseNode node)`
	`146`	`+ public static JsonNode LoadAny(ParseNode node)`
`147`	`147`	`{`
`148`	`148`	`return OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());`
`149`	`149`	`}`
`@@ -158,7 +158,7 @@ private static IOpenApiExtension LoadExtension(string name, ParseNode node)`
`158`	`158`	`}`
`159`	`159`	`else`
`160`	`160`	`{`
`161`		`- return OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());`
	`161`	`+ return (IOpenApiExtension)OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`