Code cleanup

Author: MaggieKimani1

src/Microsoft.OpenApi/Helpers/SchemaSerializerHelper.cs

@@ -624,6 +624,72 @@ internal void SerializeAsV2WithoutReference(
             writer.WriteEndObject();
         }
 
+        internal void WriteAsItemsProperties(IOpenApiWriter writer)
+        {
+            // type
+            writer.WriteProperty(OpenApiConstants.Type, (string)Type);
+
+            // format
+            if (string.IsNullOrEmpty(Format))
+            {
+                Format = AllOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format ??
+                    AnyOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format ??
+                    OneOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format;
+            }
+
+            writer.WriteProperty(OpenApiConstants.Format, Format);
+
+            // items
+            writer.WriteOptionalObject(OpenApiConstants.Items, Items, (w, s) => s.SerializeAsV2(w));
+
+            // collectionFormat
+            // We need information from style in parameter to populate this.
+            // The best effort we can make is to pull this information from the first parameter
+            // that leverages this schema. However, that in itself may not be as simple
+            // as the schema directly under parameter might be referencing one in the Components,
+            // so we will need to do a full scan of the object before we can write the value for
+            // this property. This is not supported yet, so we will skip this property at the moment.
+
+            // default
+            writer.WriteOptionalObject(OpenApiConstants.Default, Default, (w, d) => w.WriteAny(d));
+
+            // maximum
+            writer.WriteProperty(OpenApiConstants.Maximum, Maximum);
+
+            // exclusiveMaximum
+            writer.WriteProperty(OpenApiConstants.ExclusiveMaximum, ExclusiveMaximum);
+
+            // minimum
+            writer.WriteProperty(OpenApiConstants.Minimum, Minimum);
+
+            // exclusiveMinimum
+            writer.WriteProperty(OpenApiConstants.ExclusiveMinimum, ExclusiveMinimum);
+
+            // maxLength
+            writer.WriteProperty(OpenApiConstants.MaxLength, MaxLength);
+
+            // minLength
+            writer.WriteProperty(OpenApiConstants.MinLength, MinLength);
+
+            // pattern
+            writer.WriteProperty(OpenApiConstants.Pattern, Pattern);
+
+            // maxItems
+            writer.WriteProperty(OpenApiConstants.MaxItems, MaxItems);
+
+            // minItems
+            writer.WriteProperty(OpenApiConstants.MinItems, MinItems);
+
+            // enum
+            writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) => w.WriteAny(new OpenApiAny(s)));
+
+            // multipleOf
+            writer.WriteProperty(OpenApiConstants.MultipleOf, MultipleOf);
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+        }
+
         internal void WriteAsSchemaProperties(
             IOpenApiWriter writer,
             ISet<string> parentRequiredProperties,

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Json.Schema;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 
@@ -17,7 +16,6 @@ public class OpenApiWorkspace
     {
         private readonly Dictionary<string, Uri> _documentsIdRegistry = new();
         private readonly Dictionary<Uri, Stream> _artifactsRegistry = new();        
-        private readonly Dictionary<Uri, IBaseDocument> _jsonSchemaRegistry = new();
         private readonly Dictionary<Uri, IOpenApiReferenceable> _IOpenApiReferenceableRegistry = new();
 
         /// <summary>
@@ -53,7 +51,7 @@ public OpenApiWorkspace(OpenApiWorkspace workspace) { }
         /// <returns></returns>
         public int ComponentsCount()
         {
-            return _IOpenApiReferenceableRegistry.Count + _jsonSchemaRegistry.Count + _artifactsRegistry.Count;
+            return _IOpenApiReferenceableRegistry.Count + _artifactsRegistry.Count;
         }
 
         /// <summary>
@@ -65,15 +63,7 @@ public int ComponentsCount()
         public bool RegisterComponent<T>(string location, T component)
         {
             var uri = ToLocationUrl(location);
-            if (component is JsonSchema schema)
-            {
-                if (!_jsonSchemaRegistry.ContainsKey(uri))
-                {
-                    _jsonSchemaRegistry[uri] = schema;
-                    return true;
-                }
-            }
-            else if (component is IOpenApiReferenceable referenceable)
+            if (component is IOpenApiReferenceable referenceable)
             {
                 if (!_IOpenApiReferenceableRegistry.ContainsKey(uri))
                 {
@@ -128,7 +118,7 @@ public Uri GetDocumentId(string key)
         public bool Contains(string location)
         {
             var key = ToLocationUrl(location);
-            return _IOpenApiReferenceableRegistry.ContainsKey(key) || _jsonSchemaRegistry.ContainsKey(key) || _artifactsRegistry.ContainsKey(key);
+            return _IOpenApiReferenceableRegistry.ContainsKey(key) || _artifactsRegistry.ContainsKey(key);
         }
 
         /// <summary>
@@ -146,10 +136,6 @@ public T ResolveReference<T>(string location)
             {
                 return (T)referenceableValue;
             }
-            else if (_jsonSchemaRegistry.TryGetValue(uri, out var schemaValue))
-            {
-                return (T)schemaValue;
-            }
             else if (_artifactsRegistry.TryGetValue(uri, out var artifact))
             {
                 return (T)(object)artifact;
@@ -162,10 +148,5 @@ private Uri ToLocationUrl(string location)
         {
             return new(BaseUrl, location);
         }
-
-        internal Dictionary<Uri, IBaseDocument> GetSchemaRegistry()
-        {
-            return _jsonSchemaRegistry;
-        }
     }
 }

src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs

@@ -1,11 +1,6 @@
-// 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.Models;
-
 namespace Microsoft.OpenApi.Writers
 {
     /// <summary>
@@ -73,32 +68,9 @@ public interface IOpenApiWriter
         /// </summary>
         void WriteValue(object value);
 
-        /// <summary>
-        /// Write the JsonSchema object
-        /// </summary>
-        /// <param name="schema"></param>
-        /// <param name="version"></param>
-        void WriteJsonSchema(JsonSchema schema, OpenApiSpecVersion version);
-
-        /// <summary>
-        /// Write the JsonSchema object
-        /// </summary>
-        /// <param name="writer">The IOpenApiWriter object</param>
-        /// <param name="schema">The JsonSchema object</param>
-        /// <param name="version"></param>
-        void WriteJsonSchemaWithoutReference(IOpenApiWriter writer, JsonSchema schema, OpenApiSpecVersion version);
-
         /// <summary>
         /// Flush the writer.
         /// </summary>
         void Flush();
-
-        /// <summary>
-        /// Writes a reference to a JsonSchema object.
-        /// </summary>
-        /// <param name="writer"></param>
-        /// <param name="reference"></param>
-        /// <param name="version"></param>
-        void WriteJsonSchemaReference(IOpenApiWriter writer, Uri reference, OpenApiSpecVersion version);
     }
 }