Merge pull request #4026 from microsoft/bugfix/strings-error-mappings

- fixes a bug where scalar error mappings would be generated even though it's not supported by the http request adapter
microsoft · Jan 19, 2024 · 315d7b0 · 315d7b0
2 parents 9475e6e + 6c5f3cf
commit 315d7b0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Fixed a bug where scalar error mappings would be generated even though it's not supported by the http request adapter. [#4018](https://github.com/microsoft/kiota/issues/4018)
+
 ## [1.10.1] - 2024-01-12
 
 ### Added

diff --git a/src/Kiota.Builder/KiotaBuilder.cs b/src/Kiota.Builder/KiotaBuilder.cs
@@ -1283,15 +1283,14 @@ private void AddErrorMappingToExecutorMethod(OpenApiUrlTreeNode currentNode, Ope
                 : modelsNamespace;
             var errorType = CreateModelDeclarations(currentNode, errorSchema, operation, parentElement, $"{errorCode}Error", response: response);
             if (errorType is CodeType codeType &&
-                codeType.TypeDefinition is CodeClass codeClass &&
-                !codeClass.IsErrorDefinition)
+                codeType.TypeDefinition is CodeClass codeClass)
             {
-                codeClass.IsErrorDefinition = true;
+                if (!codeClass.IsErrorDefinition)
+                    codeClass.IsErrorDefinition = true;
+                executorMethod.AddErrorMapping(errorCode, errorType);
             }
-            if (errorType is null)
-                logger.LogWarning("Could not create error type for {Error} in {Operation}", errorCode, operation.OperationId);
             else
-                executorMethod.AddErrorMapping(errorCode, errorType);
+                logger.LogWarning("Could not create error type for {Error} in {Operation}", errorCode, operation.OperationId);
         }
     }
     private (CodeTypeBase?, CodeTypeBase?) GetExecutorMethodReturnType(OpenApiUrlTreeNode currentNode, OpenApiSchema? schema, OpenApiOperation operation, CodeClass parentClass, OperationType operationType)

diff --git a/tests/Kiota.Builder.Tests/KiotaBuilderTests.cs b/tests/Kiota.Builder.Tests/KiotaBuilderTests.cs
@@ -2037,6 +2037,19 @@ public void AddsErrorMapping()
                                 }
                             }
                         },
+                        ["402"] = new OpenApiResponse
+                        {
+                            Content =
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchema
+                                    {
+                                        Type = "string"
+                                    }
+                                }
+                            }
+                        },
                         ["401"] = new OpenApiResponse
                         {
                             Content =
@@ -2083,6 +2096,7 @@ public void AddsErrorMapping()
         var keys = executorMethod.ErrorMappings.Select(x => x.Key).ToHashSet();
         Assert.Contains("4XX", keys);
         Assert.Contains("401", keys);
+        Assert.DoesNotContain("402", keys);
         Assert.Contains("5XX", keys);
         var errorType401 = codeModel.FindChildByName<CodeClass>("tasks401Error");
         Assert.NotNull(errorType401);