Merge pull request #144 from microsoft/bugfix/prefixed-properties

bugfix/prefixed properties
microsoft · Apr 30, 2021 · 1c2ddde · 1c2ddde
2 parents 1483450 + 7a0f701
commit 1c2ddde
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Deterministic ordering of properties/methods/indexers/subclasses
 - Deterministic import of sub path request builders
 - Stopped generating phantom indexer methods for TypeScript and Java
+- Fixed a bug where prefixed properties would be missing their prefix for serialization
 
 ## [0.0.3] - 2021-04-25
 

diff --git a/samples b/samples
diff --git a/src/Kiota.Builder/CodeDOM/CodeProperty.cs b/src/Kiota.Builder/CodeDOM/CodeProperty.cs
@@ -22,5 +22,6 @@ public CodeProperty(CodeElement parent): base(parent)
         public CodeTypeBase Type {get;set;}
         public string DefaultValue {get;set;}
         public string Description {get; set;}
+        public string SerializationName { get; set; }
     }
 }
diff --git a/src/Kiota.Builder/KiotaBuilder.cs b/src/Kiota.Builder/KiotaBuilder.cs
@@ -403,6 +403,8 @@ private CodeProperty CreateProperty(string childIdentifier, string childType, Co
                 PropertyKind = kind,
                 Description = typeSchema?.Description,
             };
+            if(propertyName != childIdentifier)
+                prop.SerializationName = childIdentifier;
             var typeName = childType;
             var isExternal = false;
             if("string".Equals(typeName, StringComparison.OrdinalIgnoreCase) && "date-time".Equals(typeSchema?.Format, StringComparison.OrdinalIgnoreCase)) {

diff --git a/src/Kiota.Builder/Writers/CSharpWriter.cs b/src/Kiota.Builder/Writers/CSharpWriter.cs
@@ -86,7 +86,7 @@ public override void WriteProperty(CodeProperty code)
                                                     .OrderBy(x => x.Name)) {
                         WriteLine("{");
                         IncreaseIndent();
-                        WriteLine($"\"{otherProp.Name.ToFirstCharacterLowerCase()}\", (o,n) => {{ o.{otherProp.Name.ToFirstCharacterUpperCase()} = n.{GetDeserializationMethodName(otherProp.Type)}(); }}");
+                        WriteLine($"\"{otherProp.SerializationName ?? otherProp.Name.ToFirstCharacterLowerCase()}\", (o,n) => {{ o.{otherProp.Name.ToFirstCharacterUpperCase()} = n.{GetDeserializationMethodName(otherProp.Type)}(); }}");
                         DecreaseIndent();
                         WriteLine("},");
                     }
@@ -216,7 +216,7 @@ public override void WriteMethod(CodeMethod code)
                                                     .OfType<CodeProperty>()
                                                     .Where(x => x.PropertyKind == CodePropertyKind.Custom)
                                                     .OrderBy(x => x.Name)) {
-                        WriteLine($"writer.{GetSerializationMethodName(otherProp.Type)}(\"{otherProp.Name.ToFirstCharacterLowerCase()}\", {otherProp.Name.ToFirstCharacterUpperCase()});");
+                        WriteLine($"writer.{GetSerializationMethodName(otherProp.Type)}(\"{otherProp.SerializationName ?? otherProp.Name.ToFirstCharacterLowerCase()}\", {otherProp.Name.ToFirstCharacterUpperCase()});");
                     }
                     if(additionalDataProperty != null)
                         WriteLine($"writer.WriteAdditionalData({additionalDataProperty.Name});");

diff --git a/src/Kiota.Builder/Writers/JavaWriter.cs b/src/Kiota.Builder/Writers/JavaWriter.cs
@@ -143,7 +143,7 @@ public override void WriteMethod(CodeMethod code)
                                                     .OfType<CodeProperty>()
                                                     .Where(x => x.PropertyKind == CodePropertyKind.Custom)
                                                     .OrderBy(x => x.Name)) {
-                        WriteLine($"writer.{GetSerializationMethodName(otherProp.Type)}(\"{otherProp.Name.ToFirstCharacterLowerCase()}\", {otherProp.Name.ToFirstCharacterLowerCase()});");
+                        WriteLine($"writer.{GetSerializationMethodName(otherProp.Type)}(\"{otherProp.SerializationName ?? otherProp.Name.ToFirstCharacterLowerCase()}\", {otherProp.Name.ToFirstCharacterLowerCase()});");
                     }
                     if(additionalDataProperty != null)
                         WriteLine($"writer.writeAdditionalData(this.{additionalDataProperty.Name.ToFirstCharacterLowerCase()});");
@@ -159,7 +159,7 @@ public override void WriteMethod(CodeMethod code)
                         fieldToSerialize
                                 .OrderBy(x => x.Name)
                                 .Select(x => 
-                                    $"fields.put(\"{x.Name.ToFirstCharacterLowerCase()}\", (o, n) -> {{ (({parentClass.Name.ToFirstCharacterUpperCase()})o).{x.Name.ToFirstCharacterLowerCase()} = {GetDeserializationMethodName(x.Type)}; }});")
+                                    $"fields.put(\"{x.SerializationName ?? x.Name.ToFirstCharacterLowerCase()}\", (o, n) -> {{ (({parentClass.Name.ToFirstCharacterUpperCase()})o).{x.Name.ToFirstCharacterLowerCase()} = {GetDeserializationMethodName(x.Type)}; }});")
                                 .ToList()
                                 .ForEach(x => WriteLine(x));
                     WriteLine("return fields;");

diff --git a/src/Kiota.Builder/Writers/TypeScriptWriter.cs b/src/Kiota.Builder/Writers/TypeScriptWriter.cs
@@ -283,7 +283,7 @@ public override void WriteMethod(CodeMethod code)
                                                     .OfType<CodeProperty>()
                                                     .Where(x => x.PropertyKind == CodePropertyKind.Custom)
                                                     .OrderBy(x => x.Name)) {
-                        WriteLine($"[\"{otherProp.Name.ToFirstCharacterLowerCase()}\", (o, n) => {{ o.{otherProp.Name.ToFirstCharacterLowerCase()} = n.{GetDeserializationMethodName(otherProp.Type)}; }}],");
+                        WriteLine($"[\"{otherProp.SerializationName ?? otherProp.Name.ToFirstCharacterLowerCase()}\", (o, n) => {{ o.{otherProp.Name.ToFirstCharacterLowerCase()} = n.{GetDeserializationMethodName(otherProp.Type)}; }}],");
                     }
                     DecreaseIndent();
                     WriteLine("]);");
@@ -297,7 +297,7 @@ public override void WriteMethod(CodeMethod code)
                                                     .OfType<CodeProperty>()
                                                     .Where(x => x.PropertyKind == CodePropertyKind.Custom)
                                                     .OrderBy(x => x.Name)) {
-                        WriteLine($"writer.{GetSerializationMethodName(otherProp.Type)}(\"{otherProp.Name.ToFirstCharacterLowerCase()}\", this.{otherProp.Name.ToFirstCharacterLowerCase()});");
+                        WriteLine($"writer.{GetSerializationMethodName(otherProp.Type)}(\"{otherProp.SerializationName ?? otherProp.Name.ToFirstCharacterLowerCase()}\", this.{otherProp.Name.ToFirstCharacterLowerCase()});");
                     }
                     if(additionalDataProperty != null)
                         WriteLine($"writer.writeAdditionalData(this.{additionalDataProperty.Name.ToFirstCharacterLowerCase()});");