Merge pull request #2861 from papegaaij/fix-type-name-uppercase

Do not convert first char to upper on type names during code model construction

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed missing type comments in many cases.
 - Use schematized types for 206 response codes instead of binary. [#2880](https://github.com/microsoft/kiota/issues/2880)
+- Typenames are not changed to first char upper case in comments in some cases.
 
 ## [1.4.0] - 2023-07-07
 

src/Kiota.Builder/Extensions/OpenApiReferenceExtensions.cs

@@ -6,8 +6,7 @@ public static class OpenApiReferenceExtensions
     public static string GetClassName(this OpenApiReference? reference)
     {
         if (reference?.Id is string referenceId && !string.IsNullOrEmpty(referenceId))
-            return referenceId[(referenceId.LastIndexOf('.') + 1)..]
-                                    .ToFirstCharacterUpperCase();
+            return referenceId[(referenceId.LastIndexOf('.') + 1)..];
         return string.Empty;
     }
 }

src/Kiota.Builder/Writers/Python/CodeMethodWriter.cs

@@ -562,7 +562,7 @@ private void WriteRequestExecutorBody(CodeMethod codeElement, RequestParams requ
             writer.StartBlock($"{errorMappingVarName}: Dict[str, ParsableFactory] = {{");
             foreach (var errorMapping in codeElement.ErrorMappings)
             {
-                writer.WriteLine($"\"{errorMapping.Key.ToUpperInvariant()}\": {errorMapping.Value.Name},");
+                writer.WriteLine($"\"{errorMapping.Key.ToUpperInvariant()}\": {errorMapping.Value.Name.ToFirstCharacterUpperCase()},");
             }
             writer.CloseBlock();
         }

tests/Kiota.Builder.Tests/Extensions/OpenApiReferenceExtensionsTests.cs

@@ -14,7 +14,7 @@ public void GetsClassName()
         {
             Id = "microsoft.graph.user"
         };
-        Assert.Equal("User", reference.GetClassName());
+        Assert.Equal("user", reference.GetClassName());
     }
     [Fact]
     public void GetsClassNameDefensive()

tests/Kiota.Builder.Tests/Extensions/OpenApiUrlTreeNodeExtensionsTests.cs

@@ -362,6 +362,6 @@ public void GetsClassNameWithSegmentsToSkipForClassNames()
             .GetClassName(new() { "application/json" }, schema: responseSchema);
 
         // validate that we get a valid class name
-        Assert.Equal("Json", responseClassName);
+        Assert.Equal("json", responseClassName);
     }
 }

tests/Kiota.Builder.Tests/KiotaBuilderTests.cs

@@ -3427,7 +3427,7 @@ public void InheritedTypeWithInlineSchemaWorks()
         Assert.NotNull(requestExecutorMethod);
         var executorReturnType = requestExecutorMethod.ReturnType as CodeType;
         Assert.NotNull(executorReturnType);
-        Assert.Contains("DerivedObject", requestExecutorMethod.ReturnType.Name);
+        Assert.Contains("derivedObject", requestExecutorMethod.ReturnType.Name);
         var secondLevelDerivedClass = codeModel.FindChildByName<CodeClass>("derivedObject");
         Assert.NotNull(secondLevelDerivedObject);
         var factoryMethod = secondLevelDerivedClass.GetChildElements(true).OfType<CodeMethod>().FirstOrDefault(x => x.IsOfKind(CodeMethodKind.Factory));
@@ -4307,7 +4307,7 @@ public void AcceptVendorsTypes(string contentType)
         Assert.NotNull(rbClass);
         var executorMethod = rbClass.Methods.FirstOrDefault(x => x.IsOfKind(CodeMethodKind.RequestExecutor) && x.HttpMethod == Builder.CodeDOM.HttpMethod.Get);
         Assert.NotNull(executorMethod);
-        Assert.Equal("Myobject", executorMethod.ReturnType.Name);
+        Assert.Equal("myobject", executorMethod.ReturnType.Name);
     }
     [Fact]
     public void ModelsUseDescriptionWhenAvailable()
@@ -4368,21 +4368,21 @@ public void ModelsUseDescriptionWhenAvailable()
         Assert.Equal("some path item description", responseProperty.Documentation.Description);
     }
 
-    [InlineData("application/json", "206", true, "default", "Myobject")]
+    [InlineData("application/json", "206", true, "default", "myobject")]
     [InlineData("application/json", "206", false, "default", "binary")]
     [InlineData("application/json", "205", true, "default", "void")]
     [InlineData("application/json", "205", false, "default", "void")]
     [InlineData("application/json", "204", true, "default", "void")]
     [InlineData("application/json", "204", false, "default", "void")]
-    [InlineData("application/json", "203", true, "default", "Myobject")]
+    [InlineData("application/json", "203", true, "default", "myobject")]
     [InlineData("application/json", "203", false, "default", "binary")]
-    [InlineData("application/json", "202", true, "default", "Myobject")]
+    [InlineData("application/json", "202", true, "default", "myobject")]
     [InlineData("application/json", "202", false, "default", "void")]
-    [InlineData("application/json", "201", true, "default", "Myobject")]
+    [InlineData("application/json", "201", true, "default", "myobject")]
     [InlineData("application/json", "201", false, "default", "void")]
-    [InlineData("application/json", "200", true, "default", "Myobject")]
+    [InlineData("application/json", "200", true, "default", "myobject")]
     [InlineData("application/json", "200", false, "default", "binary")]
-    [InlineData("application/json", "2XX", true, "default", "Myobject")]
+    [InlineData("application/json", "2XX", true, "default", "myobject")]
     [InlineData("application/json", "2XX", false, "default", "binary")]
     [InlineData("application/xml", "204", true, "default", "void")]
     [InlineData("application/xml", "204", false, "default", "void")]
@@ -4410,7 +4410,7 @@ public void ModelsUseDescriptionWhenAvailable()
     [InlineData("*/*", "200", false, "default", "binary")]
     [InlineData("text/plain", "204", true, "default", "void")]
     [InlineData("text/plain", "204", false, "default", "void")]
-    [InlineData("text/plain", "200", true, "default", "Myobject")]
+    [InlineData("text/plain", "200", true, "default", "myobject")]
     [InlineData("text/plain", "200", false, "default", "string")]
     [InlineData("text/plain", "204", true, "application/json", "void")]
     [InlineData("text/plain", "204", false, "application/json", "void")]
@@ -4587,7 +4587,7 @@ public void Considers200WithSchemaOver2XXWithSchema()
         Assert.NotNull(rbClass);
         var executor = rbClass.Methods.FirstOrDefault(x => x.IsOfKind(CodeMethodKind.RequestExecutor));
         Assert.NotNull(executor);
-        Assert.Equal("Myobject", executor.ReturnType.Name);
+        Assert.Equal("myobject", executor.ReturnType.Name);
     }
     [Fact]
     public void Considers2XXWithSchemaOver204WithNoSchema()
@@ -4660,7 +4660,7 @@ public void Considers2XXWithSchemaOver204WithNoSchema()
         Assert.NotNull(rbClass);
         var executor = rbClass.Methods.FirstOrDefault(x => x.IsOfKind(CodeMethodKind.RequestExecutor));
         Assert.NotNull(executor);
-        Assert.Equal("Myobject", executor.ReturnType.Name);
+        Assert.Equal("myobject", executor.ReturnType.Name);
     }
     [Fact]
     public void Considers204WithNoSchemaOver206WithNoSchema()
@@ -4729,7 +4729,7 @@ public void Considers204WithNoSchemaOver206WithNoSchema()
         Assert.NotNull(executor);
         Assert.Equal("void", executor.ReturnType.Name);
     }
-    [InlineData("application/json", true, "default", "Myobject")]
+    [InlineData("application/json", true, "default", "myobject")]
     [InlineData("application/json", false, "default", "binary")]
     [InlineData("application/xml", false, "default", "binary")]
     [InlineData("application/xml", true, "default", "binary")] //MyObject when we support it
@@ -4744,7 +4744,7 @@ public void Considers204WithNoSchemaOver206WithNoSchema()
     [InlineData("*/*", true, "default", "binary")]
     [InlineData("*/*", false, "default", "binary")]
     [InlineData("text/plain", false, "default", "binary")]
-    [InlineData("text/plain", true, "default", "Myobject")]
+    [InlineData("text/plain", true, "default", "myobject")]
     [InlineData("text/plain", true, "application/json", "binary")]
     [InlineData("text/plain", false, "application/json", "binary")]
     [InlineData("text/yaml", true, "application/json", "binary")]