Clean up code

MaggieKimani1 · MaggieKimani1 · commit 076009c82f21 · 2023-11-16T11:07:36.000+03:00
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
                     };

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,7 @@ public static OpenApiExample LoadExample(ParseNode node)`
`55`	`55`	`var pointer = mapNode.GetReferencePointer();`
`56`	`56`	`if (pointer != null)`
`57`	`57`	`{`
`58`		`- var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);`
`59`		`- var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);`
`60`		`-`
`61`		`- return mapNode.GetReferencedObject<OpenApiExample>(ReferenceType.Example, pointer, summary, description);`
	`58`	`+ return mapNode.GetReferencedObject<OpenApiExample>(ReferenceType.Example, pointer);`
`62`	`59`	`}`
`63`	`60`
`64`	`61`	`var example = new OpenApiExample();`
Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,7 @@ public static OpenApiHeader LoadHeader(ParseNode node)`
`89`	`89`	`var pointer = mapNode.GetReferencePointer();`
`90`	`90`	`if (pointer != null)`
`91`	`91`	`{`
`92`		`- var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);`
`93`		`- var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);`
`94`		`-`
`95`		`- return mapNode.GetReferencedObject<OpenApiHeader>(ReferenceType.Header, pointer, summary, description);`
	`92`	`+ return mapNode.GetReferencedObject<OpenApiHeader>(ReferenceType.Header, pointer);`
`96`	`93`	`}`
`97`	`94`
`98`	`95`	`var header = new OpenApiHeader();`
Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,7 @@ public static OpenApiLink LoadLink(ParseNode node)`
`61`	`61`	`var pointer = mapNode.GetReferencePointer();`
`62`	`62`	`if (pointer != null)`
`63`	`63`	`{`
`64`		`- var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);`
`65`		`- var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);`
`66`		`-`
`67`		`- return mapNode.GetReferencedObject<OpenApiLink>(ReferenceType.Link, pointer, summary, description);`
	`64`	`+ return mapNode.GetReferencedObject<OpenApiLink>(ReferenceType.Link, pointer);`
`68`	`65`	`}`
`69`	`66`
`70`	`67`	`ParseMap(mapNode, link, _linkFixedFields, _linkPatternFields);`
Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,7 @@ public static OpenApiParameter LoadParameter(ParseNode node)`
`139`	`139`	`var pointer = mapNode.GetReferencePointer();`
`140`	`140`	`if (pointer != null)`
`141`	`141`	`{`
`142`		`- var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);`
`143`		`- var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);`
`144`		`-`
`145`		`- return mapNode.GetReferencedObject<OpenApiParameter>(ReferenceType.Parameter, pointer, summary, description);`
	`142`	`+ return mapNode.GetReferencedObject<OpenApiParameter>(ReferenceType.Parameter, pointer);`
`146`	`143`	`}`
`147`	`144`
`148`	`145`	`var parameter = new OpenApiParameter();`
Original file line number	Diff line number	Diff line change
`@@ -60,13 +60,10 @@ public static OpenApiPathItem LoadPathItem(ParseNode node)`
`60`	`60`
`61`	`61`	`if (pointer != null)`
`62`	`62`	`{`
`63`		`- var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);`
`64`		`- var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);`
`65`		`-`
`66`	`63`	`return new OpenApiPathItem()`
`67`	`64`	`{`
`68`	`65`	`UnresolvedReference = true,`
`69`		`- Reference = node.Context.VersionService.ConvertToOpenApiReference(pointer, ReferenceType.PathItem, summary, description)`
	`66`	`+ Reference = node.Context.VersionService.ConvertToOpenApiReference(pointer, ReferenceType.PathItem)`
`70`	`67`	`};`
`71`	`68`	`}`
`72`	`69`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,7 @@ public static OpenApiRequestBody LoadRequestBody(ParseNode node)`
`49`	`49`	`var pointer = mapNode.GetReferencePointer();`
`50`	`50`	`if (pointer != null)`
`51`	`51`	`{`
`52`		`- var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);`
`53`		`- var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);`
`54`		`-`
`55`		`- return mapNode.GetReferencedObject<OpenApiRequestBody>(ReferenceType.RequestBody, pointer, summary, description);`
	`52`	`+ return mapNode.GetReferencedObject<OpenApiRequestBody>(ReferenceType.RequestBody, pointer);`
`56`	`53`	`}`
`57`	`54`
`58`	`55`	`var requestBody = new OpenApiRequestBody();`
Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,7 @@ public static OpenApiResponse LoadResponse(ParseNode node)`
`54`	`54`	`var pointer = mapNode.GetReferencePointer();`
`55`	`55`	`if (pointer != null)`
`56`	`56`	`{`
`57`		`-`
`58`		`- var description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);`
`59`		`- var summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);`
`60`		`-`
`61`		`- return mapNode.GetReferencedObject<OpenApiResponse>(ReferenceType.Response, pointer, summary, description);`
	`57`	`+ return mapNode.GetReferencedObject<OpenApiResponse>(ReferenceType.Response, pointer);`
`62`	`58`	`}`
`63`	`59`
`64`	`60`	`var response = new OpenApiResponse();`
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,6 @@ public OpenApiReference ConvertToOpenApiReference(`
`86`	`86`	`{`
`87`	`87`	`return new OpenApiReference`
`88`	`88`	`{`
`89`		`- Summary = summary,`
`90`		`- Description = description,`
`91`	`89`	`Type = type,`
`92`	`90`	`Id = reference`
`93`	`91`	`};`
`@@ -97,8 +95,6 @@ public OpenApiReference ConvertToOpenApiReference(`
`97`	`95`	`// or a simple string-style reference for tag and security scheme.`
`98`	`96`	`return new OpenApiReference`
`99`	`97`	`{`
`100`		`- Summary = summary,`
`101`		`- Description = description,`
`102`	`98`	`Type = type,`
`103`	`99`	`ExternalResource = segments[0]`
`104`	`100`	`};`
`@@ -110,7 +106,7 @@ public OpenApiReference ConvertToOpenApiReference(`
`110`	`106`	`// "$ref": "#/components/schemas/Pet"`
`111`	`107`	`try`
`112`	`108`	`{`
`113`		`- return ParseLocalReference(segments[1], summary, description);`
	`109`	`+ return ParseLocalReference(segments[1]);`
`114`	`110`	`}`
`115`	`111`	`catch (OpenApiException ex)`
`116`	`112`	`{`
`@@ -165,7 +161,6 @@ public T LoadElement<T>(ParseNode node) where T : IOpenApiElement`
`165`	`161`	`return (T)_loaders[typeof(T)](node);`
`166`	`162`	`}`
`167`	`163`
`168`		`-`
`169`	`164`	`/// <inheritdoc />`
`170`	`165`	`public string GetReferenceScalarValues(MapNode mapNode, string scalarValue)`
`171`	`166`	`{`
`@@ -180,7 +175,7 @@ public string GetReferenceScalarValues(MapNode mapNode, string scalarValue)`
`180`	`175`	`return null;`
`181`	`176`	`}`
`182`	`177`
`183`		`- private OpenApiReference ParseLocalReference(string localReference, string summary = null, string description = null)`
	`178`	`+ private OpenApiReference ParseLocalReference(string localReference)`
`184`	`179`	`{`
`185`	`180`	`if (string.IsNullOrWhiteSpace(localReference))`
`186`	`181`	`{`
`@@ -202,8 +197,6 @@ private OpenApiReference ParseLocalReference(string localReference, string summa`
`202`	`197`
`203`	`198`	`var parsedReference = new OpenApiReference`
`204`	`199`	`{`
`205`		`- Summary = summary,`
`206`		`- Description = description,`
`207`	`200`	`Type = referenceType,`
`208`	`201`	`Id = refId`
`209`	`202`	`};`