Clean up code

microsoft · Nov 16, 2023 · 076009c · 076009c
1 parent 236a48d
commit 076009c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 38 deletions.
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs
@@ -55,10 +55,7 @@ public static OpenApiExample LoadExample(ParseNode node)
             var pointer = mapNode.GetReferencePointer();
             if (pointer != null)
             {
-                var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);
-                var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);
-
-                return mapNode.GetReferencedObject<OpenApiExample>(ReferenceType.Example, pointer, summary, description);
+                return mapNode.GetReferencedObject<OpenApiExample>(ReferenceType.Example, pointer);
             }
 
             var example = new OpenApiExample();

diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs
@@ -89,10 +89,7 @@ public static OpenApiHeader LoadHeader(ParseNode node)
             var pointer = mapNode.GetReferencePointer();
             if (pointer != null)
             {
-                var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);
-                var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);
-
-                return mapNode.GetReferencedObject<OpenApiHeader>(ReferenceType.Header, pointer, summary, description);
+                return mapNode.GetReferencedObject<OpenApiHeader>(ReferenceType.Header, pointer);
             }
 
             var header = new OpenApiHeader();

diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs
@@ -61,10 +61,7 @@ public static OpenApiLink LoadLink(ParseNode node)
             var pointer = mapNode.GetReferencePointer();
             if (pointer != null)
             {
-                var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);
-                var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);
-
-                return mapNode.GetReferencedObject<OpenApiLink>(ReferenceType.Link, pointer, summary, description);
+                return mapNode.GetReferencedObject<OpenApiLink>(ReferenceType.Link, pointer);
             }
 
             ParseMap(mapNode, link, _linkFixedFields, _linkPatternFields);

diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs
@@ -139,10 +139,7 @@ public static OpenApiParameter LoadParameter(ParseNode node)
             var pointer = mapNode.GetReferencePointer();
             if (pointer != null)
             {
-                var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);
-                var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);
-
-                return mapNode.GetReferencedObject<OpenApiParameter>(ReferenceType.Parameter, pointer, summary, description);
+                return mapNode.GetReferencedObject<OpenApiParameter>(ReferenceType.Parameter, pointer);
             }
 
             var parameter = new OpenApiParameter();

diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs
@@ -60,13 +60,10 @@ public static OpenApiPathItem LoadPathItem(ParseNode node)
 
             if (pointer != null)
             {
-                var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);
-                var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);
-
                 return new OpenApiPathItem()
                 {
                     UnresolvedReference = true,
-                    Reference = node.Context.VersionService.ConvertToOpenApiReference(pointer, ReferenceType.PathItem, summary, description)
+                    Reference = node.Context.VersionService.ConvertToOpenApiReference(pointer, ReferenceType.PathItem)
                 };
             }
 

diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs
@@ -49,10 +49,7 @@ public static OpenApiRequestBody LoadRequestBody(ParseNode node)
             var pointer = mapNode.GetReferencePointer();
             if (pointer != null)
             {
-                var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);
-                var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);
-
-                return mapNode.GetReferencedObject<OpenApiRequestBody>(ReferenceType.RequestBody, pointer, summary, description);
+                return mapNode.GetReferencedObject<OpenApiRequestBody>(ReferenceType.RequestBody, pointer);
             }
 
             var requestBody = new OpenApiRequestBody();

diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs
@@ -54,11 +54,7 @@ public static OpenApiResponse LoadResponse(ParseNode node)
             var pointer = mapNode.GetReferencePointer();
             if (pointer != null)
             {
-
-                var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);
-                var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);
-
-                return mapNode.GetReferencedObject<OpenApiResponse>(ReferenceType.Response, pointer, summary, description);
+                return mapNode.GetReferencedObject<OpenApiResponse>(ReferenceType.Response, pointer);
             }
 
             var response = new OpenApiResponse();

diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs
@@ -86,8 +86,6 @@ public OpenApiReference ConvertToOpenApiReference(
                     {
                         return new OpenApiReference
                         {
-                            Summary = summary,
-                            Description = description,
                             Type = type,
                             Id = reference
                         };
@@ -97,8 +95,6 @@ public OpenApiReference ConvertToOpenApiReference(
                     // or a simple string-style reference for tag and security scheme.
                     return new OpenApiReference
                     {
-                        Summary = summary,
-                        Description = description,
                         Type = type,
                         ExternalResource = segments[0]
                     };
@@ -110,7 +106,7 @@ public OpenApiReference ConvertToOpenApiReference(
                         // "$ref": "#/components/schemas/Pet"
                         try
                         {
-                            return ParseLocalReference(segments[1], summary, description);
+                            return ParseLocalReference(segments[1]);
                         }
                         catch (OpenApiException ex)
                         {
@@ -165,7 +161,6 @@ public T LoadElement<T>(ParseNode node) where T : IOpenApiElement
             return (T)_loaders[typeof(T)](node);
         }
 
-
         /// <inheritdoc />
         public string GetReferenceScalarValues(MapNode mapNode, string scalarValue)
         {
@@ -180,7 +175,7 @@ public string GetReferenceScalarValues(MapNode mapNode, string scalarValue)
             return null;
         }
 
-        private OpenApiReference ParseLocalReference(string localReference, string summary = null, string description = null)
+        private OpenApiReference ParseLocalReference(string localReference)
         {
             if (string.IsNullOrWhiteSpace(localReference))
             {
@@ -202,8 +197,6 @@ private OpenApiReference ParseLocalReference(string localReference, string summa
 
                     var parsedReference = new OpenApiReference
                     {
-                        Summary = summary,
-                        Description = description,
                         Type = referenceType,
                         Id = refId
                     };