fix: draft porting to newer proxy implementation design

Author: baywet

src/Microsoft.OpenApi.OData.Reader/Common/EdmModelHelper.cs

@@ -10,6 +10,7 @@
 using Microsoft.OData.Edm.Csdl;
 using Microsoft.OData.Edm.Vocabularies;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Vocabulary.Capabilities;
@@ -37,15 +38,15 @@ internal static OpenApiSchema GetDerivedTypesReferenceSchema(IEdmStructuredType
 
             OpenApiSchema schema = new()
             {
-                OneOf = new List<OpenApiSchema>()
+                OneOf = new List<IOpenApiSchema>()
             };
 
-            OpenApiSchema baseTypeSchema = new OpenApiSchemaReference(schemaElement.FullName(), document);
+            var baseTypeSchema = new OpenApiSchemaReference(schemaElement.FullName(), document);
             schema.OneOf.Add(baseTypeSchema);
 
             foreach (IEdmSchemaElement derivedType in derivedTypes)
             {
-                OpenApiSchema derivedTypeSchema = new OpenApiSchemaReference(derivedType.FullName(), document);
+                var derivedTypeSchema = new OpenApiSchemaReference(derivedType.FullName(), document);
                 schema.OneOf.Add(derivedTypeSchema);
             };
 

src/Microsoft.OpenApi.OData.Reader/Common/OpenApiOperationExtensions.cs

@@ -4,6 +4,7 @@
 // ------------------------------------------------------------
 
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.OData.Generator;
 using System.Collections.Generic;
 
@@ -23,7 +24,7 @@ internal static class OpenApiOperationExtensions
     /// <param name="addNoContent">Optional: Whether to add a 204 no content response.</param>
     /// <param name="schema">Optional: The OpenAPI schema of the response.</param>
     /// <param name="document">The OpenAPI document to lookup references.</param>
-    public static void AddErrorResponses(this OpenApiOperation operation, OpenApiConvertSettings settings, OpenApiDocument document, bool addNoContent = false, OpenApiSchema schema = null)
+    public static void AddErrorResponses(this OpenApiOperation operation, OpenApiConvertSettings settings, OpenApiDocument document, bool addNoContent = false, IOpenApiSchema schema = null)
     {
         Utils.CheckArgumentNull(operation, nameof(operation));
         Utils.CheckArgumentNull(settings, nameof(settings));

src/Microsoft.OpenApi.OData.Reader/Common/Utils.cs

@@ -12,6 +12,7 @@
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Vocabulary;
 
@@ -307,7 +308,7 @@ private static IEdmEntityType EntityTypeFromOperationSegment(this ODataSegment s
         /// <param name="pathItem">The value to be added.</param>
         /// <returns>true when the key and/or value are successfully added/updated to the dictionary; 
         /// false when the dictionary already contains the specified key, and nothing gets added.</returns>
-        internal static bool TryAddPath(this IDictionary<string, OpenApiPathItem> pathItems,
+        internal static bool TryAddPath(this IDictionary<string, IOpenApiPathItem> pathItems,
             ODataContext context,
             ODataPath path,
             OpenApiPathItem pathItem)

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiEdmTypeSchemaGenerator.cs

@@ -12,6 +12,7 @@
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.MicrosoftExtensions;
 using Microsoft.OpenApi.Models.References;
+using Microsoft.OpenApi.Models.Interfaces;
 
 namespace Microsoft.OpenApi.OData.Generator
 {
@@ -33,12 +34,12 @@ internal static class OpenApiErrorSchemaGenerator
         /// <param name="context">The OData to Open API context.</param>
         /// <param name="document">The Open API document to lookup references.</param>
         /// <returns>The string/schema dictionary.</returns>
-        public static IDictionary<string, OpenApiSchema> CreateODataErrorSchemas(this ODataContext context, OpenApiDocument document)
+        public static IDictionary<string, IOpenApiSchema> CreateODataErrorSchemas(this ODataContext context, OpenApiDocument document)
         {
             Utils.CheckArgumentNull(context, nameof(context));
             var rootNamespaceName = context.GetErrorNamespaceName();
 
-            return new Dictionary<string, OpenApiSchema>()
+            return new Dictionary<string, IOpenApiSchema>()
             {
                 { $"{rootNamespaceName}{ODataErrorClassName}", CreateErrorSchema(rootNamespaceName, document) },
                 { $"{rootNamespaceName}{MainErrorClassName}", CreateErrorMainSchema(rootNamespaceName, document) },
@@ -75,7 +76,7 @@ public static OpenApiSchema CreateErrorSchema(string rootNamespaceName, OpenApiD
                 {
                     "error"
                 },
-                Properties = new Dictionary<string, OpenApiSchema>
+                Properties = new Dictionary<string, IOpenApiSchema>
                 {
                     {
                         "error",
@@ -92,7 +93,7 @@ public static OpenApiSchema CreateErrorSchema(string rootNamespaceName, OpenApiD
         /// <param name="context">The OData to Open API context.</param>
         /// <param name="document">The Open API document to lookup references.</param>
         /// <returns>The inner error schema definition.</returns>
-        public static OpenApiSchema CreateInnerErrorSchema(ODataContext context, OpenApiDocument document)
+        public static IOpenApiSchema CreateInnerErrorSchema(ODataContext context, OpenApiDocument document)
         {
             Utils.CheckArgumentNull(context, nameof(context));
 
@@ -126,7 +127,7 @@ public static OpenApiSchema CreateErrorMainSchema(string rootNamespaceName, Open
                 {
                     "code", "message"
                 },
-                Properties = new Dictionary<string, OpenApiSchema>
+                Properties = new Dictionary<string, IOpenApiSchema>
                 {
                     {
                         "code", new OpenApiSchema { Type = JsonSchemaType.String, Nullable = false }
@@ -167,7 +168,7 @@ public static OpenApiSchema CreateErrorDetailSchema()
                 {
                     "code", "message"
                 },
-                Properties = new Dictionary<string, OpenApiSchema>
+                Properties = new Dictionary<string, IOpenApiSchema>
                 {
                     {
                         "code", new OpenApiSchema { Type = JsonSchemaType.String, Nullable = false, }

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiErrorSchemaGenerator.cs

@@ -9,6 +9,7 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Edm;
 using System.Linq;
+using Microsoft.OpenApi.Models.Interfaces;
 
 namespace Microsoft.OpenApi.OData.Generator
 {
@@ -28,9 +29,9 @@ internal static class OpenApiLinkGenerator
         /// <param name="parameters">"Optional: The list of parameters of the incoming operation.</param>
         /// <param name="navPropOperationId">Optional: The operation id of the source of the NavigationProperty object.</param>
         /// <returns>The created dictionary of <see cref="OpenApiLink"/> object.</returns>
-        public static IDictionary<string, OpenApiLink> CreateLinks(this ODataContext context,
+        public static IDictionary<string, IOpenApiLink> CreateLinks(this ODataContext context,
             IEdmEntityType entityType, string entityName, string entityKind, ODataPath path,
-            IList<OpenApiParameter> parameters = null, string navPropOperationId = null)
+            IList<IOpenApiParameter> parameters = null, string navPropOperationId = null)
         {
             Utils.CheckArgumentNull(context, nameof(context));
             Utils.CheckArgumentNull(entityType, nameof(entityType));
@@ -53,7 +54,7 @@ public static IDictionary<string, OpenApiLink> CreateLinks(this ODataContext con
                 }
             }
 
-            Dictionary<string, OpenApiLink> links = new();
+            Dictionary<string, IOpenApiLink> links = new();
             bool lastSegmentIsColNavProp = (path.LastSegment as ODataNavigationPropertySegment)?.NavigationProperty.TargetMultiplicity() == EdmMultiplicity.Many;
 
             // Valid only for non collection-valued navigation properties