Merge remote-tracking branch 'origin/master'

RicoSuter · RicoSuter · commit b8ff4e5a4f25 · 2025-04-28T19:55:18.000+02:00
diff --git a/src/NJsonSchema/DefaultTypeNameGenerator.cs b/src/NJsonSchema/DefaultTypeNameGenerator.cs
@@ -103,6 +103,7 @@ private string GenerateAnonymousTypeName(string typeNameHint, IEnumerable<string
                 }
 
                 typeNameHint = GetLastSegment(typeNameHint)!;
+                typeNameHint = ConversionUtilities.ConvertToUpperCamelCase(typeNameHint, true);
 
                 if (typeNameHint != null &&
                     !reservedTypeNames.Contains(typeNameHint) && 
@@ -116,7 +117,7 @@ private string GenerateAnonymousTypeName(string typeNameHint, IEnumerable<string
                 do
                 {
                     count++;
-                    typeName = ConversionUtilities.ConvertToUpperCamelCase(typeNameHint + count, true);
+                    typeName = typeNameHint + count;
                 } while (reservedTypeNames.Contains(typeName));
 
                 return typeName;

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ private string GenerateAnonymousTypeName(string typeNameHint, IEnumerable<string`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`typeNameHint = GetLastSegment(typeNameHint)!;`
	`106`	`+ typeNameHint = ConversionUtilities.ConvertToUpperCamelCase(typeNameHint, true);`
`106`	`107`
`107`	`108`	`if (typeNameHint != null &&`
`108`	`109`	`!reservedTypeNames.Contains(typeNameHint) &&`
`@@ -116,7 +117,7 @@ private string GenerateAnonymousTypeName(string typeNameHint, IEnumerable<string`
`116`	`117`	`do`
`117`	`118`	`{`
`118`	`119`	`count++;`
`119`		`- typeName = ConversionUtilities.ConvertToUpperCamelCase(typeNameHint + count, true);`
	`120`	`+ typeName = typeNameHint + count;`
`120`	`121`	`} while (reservedTypeNames.Contains(typeName));`
`121`	`122`
`122`	`123`	`return typeName;`