Code refactoring; replace JsonSchema with OpenApiSchema

Author: MaggieKimani1

src/Microsoft.OpenApi.Hidi/StatsVisitor.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Json.Schema;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Services;
 
@@ -20,7 +19,7 @@ public override void Visit(OpenApiParameter parameter)
 
         public int SchemaCount { get; set; }
 
-        public override void Visit(ref JsonSchema schema)
+        public override void Visit(OpenApiSchema schema)
         {
             SchemaCount++;
         }

src/Microsoft.OpenApi.Workbench/MainModel.cs

@@ -11,7 +11,6 @@
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader;
-using Microsoft.OpenApi.Readers;
 using Microsoft.OpenApi.Services;
 using Microsoft.OpenApi.Validations;
 

src/Microsoft.OpenApi/Helpers/JsonNodeCloneHelper.cs

@@ -4,7 +4,6 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
-using Json.Schema;
 using Microsoft.OpenApi.Any;
 
 namespace Microsoft.OpenApi.Helpers
@@ -28,18 +27,6 @@ internal static OpenApiAny Clone(OpenApiAny value)
             return new OpenApiAny(result);
         }
 
-        internal static JsonSchema CloneJsonSchema(JsonSchema schema)
-        {
-            var jsonString = Serialize(schema);
-            if (string.IsNullOrEmpty(jsonString))
-            {
-                return null;
-            }
-
-            var result = JsonSerializer.Deserialize<JsonSchema>(jsonString, options);
-            return result;
-        }
-
         private static string Serialize(object obj)
         {
             if (obj == null)

src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs

@@ -1,10 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Json.Schema;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
@@ -165,7 +164,7 @@ internal OpenApiBodyParameter ConvertToBodyParameter()
                 // V2 spec actually allows the body to have custom name.
                 // To allow round-tripping we use an extension to hold the name
                 Name = "body",
-                Schema = Content.Values.FirstOrDefault()?.Schema ?? new JsonSchemaBuilder(),
+                Schema = Content.Values.FirstOrDefault()?.Schema ?? new OpenApiSchema(),
                 Examples = Content.Values.FirstOrDefault()?.Examples,
                 Required = Required,
                 Extensions = Extensions.ToDictionary(static k => k.Key, static v => v.Value)  // Clone extensions so we can remove the x-bodyName extensions from the output V2 model.
@@ -184,24 +183,23 @@ internal IEnumerable<OpenApiFormDataParameter> ConvertToFormDataParameters()
             if (Content == null || !Content.Any())
                 yield break;
 
-            foreach (var property in Content.First().Value.Schema.GetProperties())
+            foreach (var property in Content.First().Value.Schema.Properties)
             {
                 var paramSchema = property.Value;
-                if (paramSchema.GetType().Equals(SchemaValueType.String)
-                    && ("binary".Equals(paramSchema.GetFormat().Key, StringComparison.OrdinalIgnoreCase)
-                    || "base64".Equals(paramSchema.GetFormat().Key, StringComparison.OrdinalIgnoreCase)))
+                if ("string".Equals(paramSchema.Type.ToString(), StringComparison.OrdinalIgnoreCase)
+                    && ("binary".Equals(paramSchema.Format, StringComparison.OrdinalIgnoreCase)
+                    || "base64".Equals(paramSchema.Format, StringComparison.OrdinalIgnoreCase)))
                 {
-                    // JsonSchema is immutable so these can't be set
-                    //paramSchema.Type("file");
-                    //paramSchema.Format(null);
+                    paramSchema.Type = "file";
+                    paramSchema.Format = null;
                 }
                 yield return new()
                 {
-                    Description = property.Value.GetDescription(),
+                    Description = property.Value.Description,
                     Name = property.Key,
                     Schema = property.Value,
                     Examples = Content.Values.FirstOrDefault()?.Examples,
-                    Required = Content.First().Value.Schema.GetRequired().Contains(property.Key)
+                    Required = Content.First().Value.Schema.Required?.Contains(property.Key) ?? false
                 };
             }
         }

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System;
@@ -715,6 +715,12 @@ internal void WriteAsSchemaProperties(
             ISet<string> parentRequiredProperties,
             string propertyName)
         {
+            // type
+            writer.WriteProperty(OpenApiConstants.Type, (string)Type);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
             // format
             if (string.IsNullOrEmpty(Format))
             {
@@ -728,9 +734,6 @@ internal void WriteAsSchemaProperties(
             // title
             writer.WriteProperty(OpenApiConstants.Title, Title);
 
-            // description
-            writer.WriteProperty(OpenApiConstants.Description, Description);
-
             // default
             writer.WriteOptionalObject(OpenApiConstants.Default, Default, (w, d) => w.WriteAny(d));
 
@@ -779,9 +782,6 @@ internal void WriteAsSchemaProperties(
             // enum
             writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) => w.WriteAny(new OpenApiAny(s)));
 
-            // type
-            writer.WriteProperty(OpenApiConstants.Type, (string)Type);
-
             // items
             writer.WriteOptionalObject(OpenApiConstants.Items, Items, (w, s) => s.SerializeAsV2(w));
 

src/Microsoft.OpenApi/Models/References/OpenApiHeaderReference.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Json.Schema;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
@@ -86,7 +85,7 @@ public override string Description
         public override bool AllowEmptyValue { get => Target.AllowEmptyValue; set => Target.AllowEmptyValue = value; }
 
         /// <inheritdoc/>
-        public override JsonSchema Schema { get => Target.Schema; set => Target.Schema = value; }
+        public override OpenApiSchema Schema { get => Target.Schema; set => Target.Schema = value; }
 
         /// <inheritdoc/>
         public override ParameterStyle? Style { get => Target.Style; set => Target.Style = value; }

src/Microsoft.OpenApi/Models/References/OpenApiParameterReference.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Json.Schema;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
@@ -94,7 +93,7 @@ public override string Description
         public override bool AllowReserved { get => Target.AllowReserved; set => Target.AllowReserved = value; }
 
         /// <inheritdoc/>
-        public override JsonSchema Schema { get => Target.Schema; set => Target.Schema = value; }
+        public override OpenApiSchema Schema { get => Target.Schema; set => Target.Schema = value; }
 
         /// <inheritdoc/>
         public override IDictionary<string, OpenApiExample> Examples { get => Target.Examples; set => Target.Examples = value; }

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

@@ -2,8 +2,8 @@
 // Licensed under the MIT license.
 
 using System;
-using Json.Schema;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.Reader.ParseNodes
 {
@@ -15,7 +15,7 @@ internal class AnyFieldMapParameter<T>
         public AnyFieldMapParameter(
             Func<T, OpenApiAny> propertyGetter,
             Action<T, OpenApiAny> propertySetter,
-            Func<T, JsonSchema> SchemaGetter = null)
+            Func<T, OpenApiSchema> SchemaGetter = null)
         {
             this.PropertyGetter = propertyGetter;
             this.PropertySetter = propertySetter;
@@ -35,6 +35,6 @@ public AnyFieldMapParameter(
         /// <summary>
         /// Function to get the schema to apply to the property.
         /// </summary>
-        public Func<T, JsonSchema> SchemaGetter { get; }
+        public Func<T, OpenApiSchema> SchemaGetter { get; }
     }
 }

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

@@ -1,10 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
-using Json.Schema;
+using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.Reader.ParseNodes
 {
@@ -16,7 +16,7 @@ internal class AnyListFieldMapParameter<T>
         public AnyListFieldMapParameter(
             Func<T, IList<JsonNode>> propertyGetter,
             Action<T, IList<JsonNode>> propertySetter,
-            Func<T, JsonSchema> SchemaGetter = null)
+            Func<T, OpenApiSchema> SchemaGetter = null)
         {
             this.PropertyGetter = propertyGetter;
             this.PropertySetter = propertySetter;
@@ -36,6 +36,6 @@ public AnyListFieldMapParameter(
         /// <summary>
         /// Function to get the schema to apply to the property.
         /// </summary>
-        public Func<T, JsonSchema> SchemaGetter { get; }
+        public Func<T, OpenApiSchema> SchemaGetter { get; }
     }
 }

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

@@ -1,10 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Json.Schema;
 using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.Reader.ParseNodes
 {
@@ -17,7 +17,7 @@ public AnyMapFieldMapParameter(
             Func<T, IDictionary<string, U>> propertyMapGetter,
             Func<U, OpenApiAny> propertyGetter,
             Action<U, OpenApiAny> propertySetter,
-            Func<T, JsonSchema> schemaGetter)
+            Func<T, OpenApiSchema> schemaGetter)
         {
             this.PropertyMapGetter = propertyMapGetter;
             this.PropertyGetter = propertyGetter;
@@ -43,6 +43,6 @@ public AnyMapFieldMapParameter(
         /// <summary>
         /// Function to get the schema to apply to the property.
         /// </summary>
-        public Func<T, JsonSchema> SchemaGetter { get; }
+        public Func<T, OpenApiSchema> SchemaGetter { get; }
     }
 }