Skip to content

Commit c109399

Browse files
devhl-labsdevhl-labs
authored
fixed property naming convention for composed types (#18312)
1 parent c7b33c4 commit c109399

11 files changed

Lines changed: 98 additions & 98 deletions

File tree

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
585585
List<CodegenProperty> allOf = composedSchemas.getAllOf();
586586
if (allOf != null) {
587587
for (CodegenProperty property : allOf) {
588-
property.name = patchPropertyName(model, property.baseType);
588+
property.name = patchPropertyName(model, camelize(property.baseType));
589589
patchPropertyVendorExtensions(property);
590590
}
591591
}
@@ -594,7 +594,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
594594
if (anyOf != null) {
595595
removePropertiesDeclaredInComposedTypes(objs, model, anyOf);
596596
for (CodegenProperty property : anyOf) {
597-
property.name = patchPropertyName(model, property.baseType);
597+
property.name = patchPropertyName(model, camelize(property.baseType));
598598
property.isNullable = true;
599599
patchPropertyVendorExtensions(property);
600600
}
@@ -604,7 +604,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
604604
if (oneOf != null) {
605605
removePropertiesDeclaredInComposedTypes(objs, model, oneOf);
606606
for (CodegenProperty property : oneOf) {
607-
property.name = patchPropertyName(model, property.baseType);
607+
property.name = patchPropertyName(model, camelize(property.baseType));
608608
property.isNullable = true;
609609
patchPropertyVendorExtensions(property);
610610
}

‎samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OneOfString.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ public partial class OneOfString : IValidatableObject
3232
/// <summary>
3333
/// Initializes a new instance of the <see cref="OneOfString" /> class.
3434
/// </summary>
35-
/// <param name="varString"></param>
36-
internal OneOfString(string varString)
35+
/// <param name="string"></param>
36+
internal OneOfString(string @string)
3737
{
38-
VarString = varString;
38+
String = @string;
3939
OnCreated();
4040
}
4141

4242
partial void OnCreated();
4343

4444
/// <summary>
45-
/// Gets or Sets VarString
45+
/// Gets or Sets String
4646
/// </summary>
47-
public string VarString { get; set; }
47+
public string String { get; set; }
4848

4949
/// <summary>
5050
/// Gets or Sets additional properties

‎samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/PolymorphicProperty.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ public partial class PolymorphicProperty : IValidatableObject
3232
/// <summary>
3333
/// Initializes a new instance of the <see cref="PolymorphicProperty" /> class.
3434
/// </summary>
35-
/// <param name="varBool"></param>
36-
internal PolymorphicProperty(bool varBool)
35+
/// <param name="bool"></param>
36+
internal PolymorphicProperty(bool @bool)
3737
{
38-
VarBool = varBool;
38+
Bool = @bool;
3939
OnCreated();
4040
}
4141

4242
/// <summary>
4343
/// Initializes a new instance of the <see cref="PolymorphicProperty" /> class.
4444
/// </summary>
45-
/// <param name="varString"></param>
46-
internal PolymorphicProperty(string varString)
45+
/// <param name="string"></param>
46+
internal PolymorphicProperty(string @string)
4747
{
48-
VarString = varString;
48+
String = @string;
4949
OnCreated();
5050
}
5151

@@ -72,14 +72,14 @@ internal PolymorphicProperty(List<string> list)
7272
partial void OnCreated();
7373

7474
/// <summary>
75-
/// Gets or Sets VarBool
75+
/// Gets or Sets Bool
7676
/// </summary>
77-
public bool? VarBool { get; set; }
77+
public bool? Bool { get; set; }
7878

7979
/// <summary>
80-
/// Gets or Sets VarString
80+
/// Gets or Sets String
8181
/// </summary>
82-
public string VarString { get; set; }
82+
public string String { get; set; }
8383

8484
/// <summary>
8585
/// Gets or Sets Object
@@ -159,11 +159,11 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
159159

160160
if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1)
161161
{
162-
Utf8JsonReader utf8JsonReaderVarBool = utf8JsonReader;
163-
ClientUtils.TryDeserialize<bool?>(ref utf8JsonReaderVarBool, jsonSerializerOptions, out varBool);
162+
Utf8JsonReader utf8JsonReaderBool = utf8JsonReader;
163+
ClientUtils.TryDeserialize<bool?>(ref utf8JsonReaderBool, jsonSerializerOptions, out varBool);
164164

165-
Utf8JsonReader utf8JsonReaderVarString = utf8JsonReader;
166-
ClientUtils.TryDeserialize<string>(ref utf8JsonReaderVarString, jsonSerializerOptions, out varString);
165+
Utf8JsonReader utf8JsonReaderString = utf8JsonReader;
166+
ClientUtils.TryDeserialize<string>(ref utf8JsonReaderString, jsonSerializerOptions, out varString);
167167

168168
Utf8JsonReader utf8JsonReaderObject = utf8JsonReader;
169169
ClientUtils.TryDeserialize<Object>(ref utf8JsonReaderObject, jsonSerializerOptions, out varObject);

‎samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OneOfString.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ public partial class OneOfString : IValidatableObject
3434
/// <summary>
3535
/// Initializes a new instance of the <see cref="OneOfString" /> class.
3636
/// </summary>
37-
/// <param name="varString"></param>
38-
internal OneOfString(string varString)
37+
/// <param name="string"></param>
38+
internal OneOfString(string @string)
3939
{
40-
VarString = varString;
40+
String = @string;
4141
OnCreated();
4242
}
4343

4444
partial void OnCreated();
4545

4646
/// <summary>
47-
/// Gets or Sets VarString
47+
/// Gets or Sets String
4848
/// </summary>
49-
public string? VarString { get; set; }
49+
public string? String { get; set; }
5050

5151
/// <summary>
5252
/// Gets or Sets additional properties

‎samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/PolymorphicProperty.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ public partial class PolymorphicProperty : IValidatableObject
3434
/// <summary>
3535
/// Initializes a new instance of the <see cref="PolymorphicProperty" /> class.
3636
/// </summary>
37-
/// <param name="varBool"></param>
38-
internal PolymorphicProperty(bool varBool)
37+
/// <param name="bool"></param>
38+
internal PolymorphicProperty(bool @bool)
3939
{
40-
VarBool = varBool;
40+
Bool = @bool;
4141
OnCreated();
4242
}
4343

4444
/// <summary>
4545
/// Initializes a new instance of the <see cref="PolymorphicProperty" /> class.
4646
/// </summary>
47-
/// <param name="varString"></param>
48-
internal PolymorphicProperty(string varString)
47+
/// <param name="string"></param>
48+
internal PolymorphicProperty(string @string)
4949
{
50-
VarString = varString;
50+
String = @string;
5151
OnCreated();
5252
}
5353

@@ -74,14 +74,14 @@ internal PolymorphicProperty(List<string> list)
7474
partial void OnCreated();
7575

7676
/// <summary>
77-
/// Gets or Sets VarBool
77+
/// Gets or Sets Bool
7878
/// </summary>
79-
public bool? VarBool { get; set; }
79+
public bool? Bool { get; set; }
8080

8181
/// <summary>
82-
/// Gets or Sets VarString
82+
/// Gets or Sets String
8383
/// </summary>
84-
public string? VarString { get; set; }
84+
public string? String { get; set; }
8585

8686
/// <summary>
8787
/// Gets or Sets Object
@@ -161,11 +161,11 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
161161

162162
if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1)
163163
{
164-
Utf8JsonReader utf8JsonReaderVarBool = utf8JsonReader;
165-
ClientUtils.TryDeserialize<bool?>(ref utf8JsonReaderVarBool, jsonSerializerOptions, out varBool);
164+
Utf8JsonReader utf8JsonReaderBool = utf8JsonReader;
165+
ClientUtils.TryDeserialize<bool?>(ref utf8JsonReaderBool, jsonSerializerOptions, out varBool);
166166

167-
Utf8JsonReader utf8JsonReaderVarString = utf8JsonReader;
168-
ClientUtils.TryDeserialize<string?>(ref utf8JsonReaderVarString, jsonSerializerOptions, out varString);
167+
Utf8JsonReader utf8JsonReaderString = utf8JsonReader;
168+
ClientUtils.TryDeserialize<string?>(ref utf8JsonReaderString, jsonSerializerOptions, out varString);
169169

170170
Utf8JsonReader utf8JsonReaderObject = utf8JsonReader;
171171
ClientUtils.TryDeserialize<Object?>(ref utf8JsonReaderObject, jsonSerializerOptions, out varObject);

‎samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ public partial class OneOfString : IValidatableObject
3232
/// <summary>
3333
/// Initializes a new instance of the <see cref="OneOfString" /> class.
3434
/// </summary>
35-
/// <param name="varString"></param>
36-
internal OneOfString(string varString)
35+
/// <param name="string"></param>
36+
internal OneOfString(string @string)
3737
{
38-
VarString = varString;
38+
String = @string;
3939
OnCreated();
4040
}
4141

4242
partial void OnCreated();
4343

4444
/// <summary>
45-
/// Gets or Sets VarString
45+
/// Gets or Sets String
4646
/// </summary>
47-
public string VarString { get; set; }
47+
public string String { get; set; }
4848

4949
/// <summary>
5050
/// Gets or Sets additional properties

‎samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ public partial class PolymorphicProperty : IValidatableObject
3232
/// <summary>
3333
/// Initializes a new instance of the <see cref="PolymorphicProperty" /> class.
3434
/// </summary>
35-
/// <param name="varBool"></param>
36-
internal PolymorphicProperty(bool varBool)
35+
/// <param name="bool"></param>
36+
internal PolymorphicProperty(bool @bool)
3737
{
38-
VarBool = varBool;
38+
Bool = @bool;
3939
OnCreated();
4040
}
4141

4242
/// <summary>
4343
/// Initializes a new instance of the <see cref="PolymorphicProperty" /> class.
4444
/// </summary>
45-
/// <param name="varString"></param>
46-
internal PolymorphicProperty(string varString)
45+
/// <param name="string"></param>
46+
internal PolymorphicProperty(string @string)
4747
{
48-
VarString = varString;
48+
String = @string;
4949
OnCreated();
5050
}
5151

@@ -72,14 +72,14 @@ internal PolymorphicProperty(List<string> list)
7272
partial void OnCreated();
7373

7474
/// <summary>
75-
/// Gets or Sets VarBool
75+
/// Gets or Sets Bool
7676
/// </summary>
77-
public bool? VarBool { get; set; }
77+
public bool? Bool { get; set; }
7878

7979
/// <summary>
80-
/// Gets or Sets VarString
80+
/// Gets or Sets String
8181
/// </summary>
82-
public string VarString { get; set; }
82+
public string String { get; set; }
8383

8484
/// <summary>
8585
/// Gets or Sets Object
@@ -159,11 +159,11 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
159159

160160
if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1)
161161
{
162-
Utf8JsonReader utf8JsonReaderVarBool = utf8JsonReader;
163-
ClientUtils.TryDeserialize<bool?>(ref utf8JsonReaderVarBool, jsonSerializerOptions, out varBool);
162+
Utf8JsonReader utf8JsonReaderBool = utf8JsonReader;
163+
ClientUtils.TryDeserialize<bool?>(ref utf8JsonReaderBool, jsonSerializerOptions, out varBool);
164164

165-
Utf8JsonReader utf8JsonReaderVarString = utf8JsonReader;
166-
ClientUtils.TryDeserialize<string>(ref utf8JsonReaderVarString, jsonSerializerOptions, out varString);
165+
Utf8JsonReader utf8JsonReaderString = utf8JsonReader;
166+
ClientUtils.TryDeserialize<string>(ref utf8JsonReaderString, jsonSerializerOptions, out varString);
167167

168168
Utf8JsonReader utf8JsonReaderObject = utf8JsonReader;
169169
ClientUtils.TryDeserialize<Object>(ref utf8JsonReaderObject, jsonSerializerOptions, out varObject);

‎samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OneOfString.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ public partial class OneOfString : IValidatableObject
3535
/// <summary>
3636
/// Initializes a new instance of the <see cref="OneOfString" /> class.
3737
/// </summary>
38-
/// <param name="varString"></param>
39-
internal OneOfString(string varString)
38+
/// <param name="string"></param>
39+
internal OneOfString(string @string)
4040
{
41-
VarString = varString;
41+
String = @string;
4242
OnCreated();
4343
}
4444

4545
partial void OnCreated();
4646

4747
/// <summary>
48-
/// Gets or Sets VarString
48+
/// Gets or Sets String
4949
/// </summary>
50-
public string? VarString { get; set; }
50+
public string? String { get; set; }
5151

5252
/// <summary>
5353
/// Gets or Sets additional properties

‎samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/PolymorphicProperty.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ public partial class PolymorphicProperty : IValidatableObject
3535
/// <summary>
3636
/// Initializes a new instance of the <see cref="PolymorphicProperty" /> class.
3737
/// </summary>
38-
/// <param name="varBool"></param>
39-
internal PolymorphicProperty(bool varBool)
38+
/// <param name="bool"></param>
39+
internal PolymorphicProperty(bool @bool)
4040
{
41-
VarBool = varBool;
41+
Bool = @bool;
4242
OnCreated();
4343
}
4444

4545
/// <summary>
4646
/// Initializes a new instance of the <see cref="PolymorphicProperty" /> class.
4747
/// </summary>
48-
/// <param name="varString"></param>
49-
internal PolymorphicProperty(string varString)
48+
/// <param name="string"></param>
49+
internal PolymorphicProperty(string @string)
5050
{
51-
VarString = varString;
51+
String = @string;
5252
OnCreated();
5353
}
5454

@@ -75,14 +75,14 @@ internal PolymorphicProperty(List<string> list)
7575
partial void OnCreated();
7676

7777
/// <summary>
78-
/// Gets or Sets VarBool
78+
/// Gets or Sets Bool
7979
/// </summary>
80-
public bool? VarBool { get; set; }
80+
public bool? Bool { get; set; }
8181

8282
/// <summary>
83-
/// Gets or Sets VarString
83+
/// Gets or Sets String
8484
/// </summary>
85-
public string? VarString { get; set; }
85+
public string? String { get; set; }
8686

8787
/// <summary>
8888
/// Gets or Sets Object
@@ -162,11 +162,11 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
162162

163163
if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1)
164164
{
165-
Utf8JsonReader utf8JsonReaderVarBool = utf8JsonReader;
166-
ClientUtils.TryDeserialize<bool?>(ref utf8JsonReaderVarBool, jsonSerializerOptions, out varBool);
165+
Utf8JsonReader utf8JsonReaderBool = utf8JsonReader;
166+
ClientUtils.TryDeserialize<bool?>(ref utf8JsonReaderBool, jsonSerializerOptions, out varBool);
167167

168-
Utf8JsonReader utf8JsonReaderVarString = utf8JsonReader;
169-
ClientUtils.TryDeserialize<string?>(ref utf8JsonReaderVarString, jsonSerializerOptions, out varString);
168+
Utf8JsonReader utf8JsonReaderString = utf8JsonReader;
169+
ClientUtils.TryDeserialize<string?>(ref utf8JsonReaderString, jsonSerializerOptions, out varString);
170170

171171
Utf8JsonReader utf8JsonReaderObject = utf8JsonReader;
172172
ClientUtils.TryDeserialize<Object?>(ref utf8JsonReaderObject, jsonSerializerOptions, out varObject);

‎samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ public partial class OneOfString : IValidatableObject
3232
/// <summary>
3333
/// Initializes a new instance of the <see cref="OneOfString" /> class.
3434
/// </summary>
35-
/// <param name="varString"></param>
36-
internal OneOfString(string varString)
35+
/// <param name="string"></param>
36+
internal OneOfString(string @string)
3737
{
38-
VarString = varString;
38+
String = @string;
3939
OnCreated();
4040
}
4141

4242
partial void OnCreated();
4343

4444
/// <summary>
45-
/// Gets or Sets VarString
45+
/// Gets or Sets String
4646
/// </summary>
47-
public string VarString { get; set; }
47+
public string String { get; set; }
4848

4949
/// <summary>
5050
/// Gets or Sets additional properties

0 commit comments

Comments
 (0)