- updates factory parameter name and type

microsoft · Feb 10, 2022 · a31206c · a31206c
1 parent 8a9b9f6
commit a31206c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/src/Kiota.Builder/CodeDOM/CodeParameter.cs b/src/Kiota.Builder/CodeDOM/CodeParameter.cs
@@ -34,9 +34,9 @@ public enum CodeParameterKind
         /// </summary>
         Cancellation,
         /// <summary>
-        /// A parameter representing the mapping value to be used for deserialization during discrimination.
+        /// A parameter representing the parse node to be used for deserialization during discrimination.
         /// </summary>
-        MappingValue
+        ParseNode
     }
 
     public class CodeParameter : CodeTerminal, ICloneable, IDocumentedElement

diff --git a/src/Kiota.Builder/KiotaBuilder.cs b/src/Kiota.Builder/KiotaBuilder.cs
@@ -844,7 +844,7 @@ private CodeClass AddModelClass(OpenApiUrlTreeNode currentNode, OpenApiSchema sc
         }).First();
         factoryMethod.AddParameter(new CodeParameter {
             Name = "parseNode",
-            ParameterKind = CodeParameterKind.MappingValue,
+            ParameterKind = CodeParameterKind.ParseNode,
             Optional = false,
             Type = new CodeType { Name = ParseNodeInterface, IsExternal = true },
         });

diff --git a/src/Kiota.Builder/Refiners/CommonLanguageRefiner.cs b/src/Kiota.Builder/Refiners/CommonLanguageRefiner.cs
@@ -576,7 +576,7 @@ protected static void AddParentClassToErrorClasses(CodeElement currentElement, s
         }
         CrawlTree(currentElement, x => AddParentClassToErrorClasses(x, parentClassName, parentClassNamespace));
     }
-    protected static void AddDiscriminatorMappingsUsingsToParentClasses(CodeElement currentElement, bool addFactoryMethodImport = false) {
+    protected static void AddDiscriminatorMappingsUsingsToParentClasses(CodeElement currentElement, string parseNodeInterfaceName, bool addFactoryMethodImport = false) {
         if(currentElement is CodeMethod currentMethod &&
             currentMethod.Parent is CodeClass parentClass &&
             parentClass.StartBlock is CodeClass.Declaration declaration) {
@@ -589,6 +589,7 @@ currentMethod.Parent is CodeClass parentClass &&
                                 TypeDefinition = codeType.TypeDefinition,
                             } : null,
                         }).ToArray());
+                        currentMethod.Parameters.OfKind(CodeParameterKind.ParseNode).Type.Name = parseNodeInterfaceName;
                 } else if (addFactoryMethodImport &&
                     currentMethod.IsOfKind(CodeMethodKind.RequestExecutor) &&
                     currentMethod.ReturnType is CodeType type &&
@@ -603,6 +604,6 @@ type.TypeDefinition is CodeClass modelClass &&
                         });
                 }
         }
-        CrawlTree(currentElement, x => AddDiscriminatorMappingsUsingsToParentClasses(x, addFactoryMethodImport));
+        CrawlTree(currentElement, x => AddDiscriminatorMappingsUsingsToParentClasses(x, parseNodeInterfaceName, addFactoryMethodImport));
     }
 }
diff --git a/src/Kiota.Builder/Refiners/GoRefiner.cs b/src/Kiota.Builder/Refiners/GoRefiner.cs
@@ -94,6 +94,7 @@ public override void Refine(CodeNamespace generatedCode)
         );
         AddDiscriminatorMappingsUsingsToParentClasses(
             generatedCode,
+            "ParseNode",
             true
         );
     }
@@ -264,7 +265,7 @@ private static void AddErrorImportForEnums(CodeElement currentElement) {
             "strconv", "FormatBool"),
         new (x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Serializer),
             "github.com/microsoft/kiota/abstractions/go/serialization", "SerializationWriter"),
-        new (x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Deserializer),
+        new (x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Deserializer, CodeMethodKind.Factory),
             "github.com/microsoft/kiota/abstractions/go/serialization", "ParseNode", "Parsable"),
         new (x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestExecutor) && method.ErrorMappings.Any(),
             "github.com/microsoft/kiota/abstractions/go/serialization", "Parsable"),

diff --git a/src/Kiota.Builder/Refiners/TypeScriptRefiner.cs b/src/Kiota.Builder/Refiners/TypeScriptRefiner.cs
@@ -38,7 +38,8 @@ public override void Refine(CodeNamespace generatedCode)
                 "@microsoft/kiota-abstractions"
         );
         AddDiscriminatorMappingsUsingsToParentClasses(
-            generatedCode
+            generatedCode,
+            "ParseNode"
         );
     }
     private static readonly CodeUsingDeclarationNameComparer usingComparer = new();
@@ -79,7 +80,7 @@ currentClass.StartBlock is CodeClass.Declaration currentDeclaration &&
             AbstractionsPackageName, "ResponseHandler"),
         new (x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Serializer),
             AbstractionsPackageName, "SerializationWriter"),
-        new (x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Deserializer),
+        new (x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Deserializer, CodeMethodKind.Factory),
             AbstractionsPackageName, "ParseNode"),
         new (x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Constructor, CodeMethodKind.ClientConstructor, CodeMethodKind.IndexerBackwardCompatibility),
             AbstractionsPackageName, "getPathParameters"),