Ensure ApiPath does not get a NullReferenceExcepton when copying comm…

…on parameters to operation method parameters. (#5914) Previously, when the operation method does not have any parameters a null refference exception occurs when attempting to copy the common parameters to the operation metod.
Azure · Apr 14, 2023 · aef61a7 · aef61a7
1 parent fbac9fb
commit aef61a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/ApiPath.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/ApiPath.cs
@@ -36,6 +36,11 @@ public Dictionary<string, Operation> operations
                 {
                     if (this.parameters != null)
                     {
+                        if (operation.parameters == null)
+                        {
+                            operation.parameters = new List<Parameter>();
+                        }
+
                         operation.parameters.AddRange(this.parameters);
                     }   
                     ret.Add(method, operation);

diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/azureopenai.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/azureopenai.json
@@ -7,6 +7,11 @@
   },
   "paths": {
     "/deployments": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/apiVersionQueryParameter"
+        }
+      ],
       "get": {
         "tags": [
           "Deployments:"
@@ -16,11 +21,6 @@
         "produces": [
           "application/json"
         ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/apiVersionQueryParameter"
-          }
-        ],
         "responses": {
           "200": {
             "description": "Success",
@@ -54,9 +54,6 @@
           "application/json"
         ],
         "parameters": [
-          {
-            "$ref": "#/parameters/apiVersionQueryParameter"
-          },
           {
             "in": "body",
             "name": "body",