Skip to content

Commit 6932a22

Browse files
Copilotalexaka1
Copilot
and
alexaka1
committed
fix: eliminate extra blank lines in generated enum converters
Replace triple-negation pattern ({{^isFloat}}{{^isDouble}}{{^isDecimal}}) with positive flags ({{#isInteger}}, {{#isLong}}) for integer enum branches. The triple-negation caused the Java Mustache engine to produce spurious blank lines and incorrect indentation in the generated C# code. Co-authored-by: alexaka1 <22166651+alexaka1@users.noreply.github.com>
1 parent b672dfd commit 6932a22

75 files changed

Lines changed: 20 additions & 440 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,12 @@
9090
/// <exception cref="NotImplementedException"></exception>
9191
{{>visibility}} static {{>EnumValueDataType}} ToJsonValue({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} value)
9292
{
93-
{{^isString}}
94-
{{^isFloat}}{{^isDouble}}{{^isDecimal}}
93+
{{#isInteger}}
94+
return ({{>EnumValueDataType}}) value;
95+
{{/isInteger}}
96+
{{#isLong}}
9597
return ({{>EnumValueDataType}}) value;
96-
{{/isDecimal}}{{/isDouble}}{{/isFloat}}
98+
{{/isLong}}
9799
{{#isFloat}}
98100
{{#allowableValues}}
99101
{{#enumVars}}
@@ -124,7 +126,6 @@
124126
{{/allowableValues}}
125127
throw new NotImplementedException($"Value could not be handled: '{value}'");
126128
{{/isDecimal}}
127-
{{/isString}}
128129
{{#isString}}
129130
{{#allowableValues}}
130131
{{#enumVars}}
@@ -153,12 +154,16 @@
153154
/// <returns></returns>
154155
public override {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
155156
{
156-
{{^isString}}
157-
{{^isFloat}}{{^isDouble}}{{^isDecimal}}
157+
{{#isInteger}}
158+
{{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}();
159+
{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue;
160+
return result;
161+
{{/isInteger}}
162+
{{#isLong}}
158163
{{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}();
159164
{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue;
160165
return result;
161-
{{/isDecimal}}{{/isDouble}}{{/isFloat}}
166+
{{/isLong}}
162167
{{#isFloat}}
163168
string rawValue = reader.GetSingle().ToString(System.Globalization.CultureInfo.InvariantCulture);
164169
{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue);
@@ -180,7 +185,6 @@
180185
return result.Value;
181186
throw new JsonException();
182187
{{/isDecimal}}
183-
{{/isString}}
184188
{{#isString}}
185189
string{{nrt?}} rawValue = reader.GetString();
186190

@@ -230,11 +234,17 @@
230234
if (reader.TokenType == JsonTokenType.Null)
231235
return null;
232236

233-
{{^isFloat}}{{^isDouble}}{{^isDecimal}}
237+
{{/isString}}
238+
{{#isInteger}}
239+
{{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}();
240+
{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue;
241+
return result;
242+
{{/isInteger}}
243+
{{#isLong}}
234244
{{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}();
235245
{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue;
236246
return result;
237-
{{/isDecimal}}{{/isDouble}}{{/isFloat}}
247+
{{/isLong}}
238248
{{#isFloat}}
239249
string rawValue = reader.GetSingle().ToString(System.Globalization.CultureInfo.InvariantCulture);
240250
{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue);
@@ -256,7 +266,6 @@
256266
return result.Value;
257267
throw new JsonException();
258268
{{/isDecimal}}
259-
{{/isString}}
260269
{{#isString}}
261270
string{{nrt?}} rawValue = reader.GetString();
262271

‎samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ public static EnumTestEnumInteger FromString(string value)
8585
/// <exception cref="NotImplementedException"></exception>
8686
public static int ToJsonValue(EnumTestEnumInteger value)
8787
{
88-
8988
return (int) value;
90-
9189
}
9290
}
9391

@@ -106,11 +104,9 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter<EnumTestEnumIntege
106104
/// <returns></returns>
107105
public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
108106
{
109-
110107
int rawValue = reader.GetInt32();
111108
EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue;
112109
return result;
113-
114110
}
115111

116112
/// <summary>
@@ -142,11 +138,9 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter<EnumTestEn
142138
if (reader.TokenType == JsonTokenType.Null)
143139
return null;
144140

145-
146141
int rawValue = reader.GetInt32();
147142
EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue;
148143
return result;
149-
150144
}
151145

152146
/// <summary>

‎samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ public static EnumTestEnumIntegerOnly FromString(string value)
8585
/// <exception cref="NotImplementedException"></exception>
8686
public static int ToJsonValue(EnumTestEnumIntegerOnly value)
8787
{
88-
8988
return (int) value;
90-
9189
}
9290
}
9391

@@ -106,11 +104,9 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter<EnumTestEnumIn
106104
/// <returns></returns>
107105
public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
108106
{
109-
110107
int rawValue = reader.GetInt32();
111108
EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue;
112109
return result;
113-
114110
}
115111

116112
/// <summary>
@@ -142,11 +138,9 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter<EnumTe
142138
if (reader.TokenType == JsonTokenType.Null)
143139
return null;
144140

145-
146141
int rawValue = reader.GetInt32();
147142
EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue;
148143
return result;
149-
150144
}
151145

152146
/// <summary>

‎samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value)
9696
/// <exception cref="NotImplementedException"></exception>
9797
public static int ToJsonValue(OuterEnumInteger value)
9898
{
99-
10099
return (int) value;
101-
102100
}
103101
}
104102

@@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter<OuterEnumInteger>
117115
/// <returns></returns>
118116
public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
119117
{
120-
121118
int rawValue = reader.GetInt32();
122119
OuterEnumInteger result = (OuterEnumInteger)rawValue;
123120
return result;
124-
125121
}
126122

127123
/// <summary>
@@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter<OuterEnumInte
153149
if (reader.TokenType == JsonTokenType.Null)
154150
return null;
155151

156-
157152
int rawValue = reader.GetInt32();
158153
OuterEnumInteger result = (OuterEnumInteger)rawValue;
159154
return result;
160-
161155
}
162156

163157
/// <summary>

‎samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value)
9696
/// <exception cref="NotImplementedException"></exception>
9797
public static int ToJsonValue(OuterEnumIntegerDefaultValue value)
9898
{
99-
10099
return (int) value;
101-
102100
}
103101
}
104102

@@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter<OuterEnum
117115
/// <returns></returns>
118116
public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
119117
{
120-
121118
int rawValue = reader.GetInt32();
122119
OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue;
123120
return result;
124-
125121
}
126122

127123
/// <summary>
@@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter<O
153149
if (reader.TokenType == JsonTokenType.Null)
154150
return null;
155151

156-
157152
int rawValue = reader.GetInt32();
158153
OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue;
159154
return result;
160-
161155
}
162156

163157
/// <summary>

‎samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu
8585
/// <exception cref="NotImplementedException"></exception>
8686
public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value)
8787
{
88-
8988
return (int) value;
90-
9189
}
9290
}
9391

@@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv
106104
/// <returns></returns>
107105
public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
108106
{
109-
110107
int rawValue = reader.GetInt32();
111108
RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue;
112109
return result;
113-
114110
}
115111

116112
/// <summary>
@@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter :
142138
if (reader.TokenType == JsonTokenType.Null)
143139
return null;
144140

145-
146141
int rawValue = reader.GetInt32();
147142
RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue;
148143
return result;
149-
150144
}
151145

152146
/// <summary>

‎samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string
8585
/// <exception cref="NotImplementedException"></exception>
8686
public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value)
8787
{
88-
8988
return (int) value;
90-
9189
}
9290
}
9391

@@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json
106104
/// <returns></returns>
107105
public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
108106
{
109-
110107
int rawValue = reader.GetInt32();
111108
RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue;
112109
return result;
113-
114110
}
115111

116112
/// <summary>
@@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte
142138
if (reader.TokenType == JsonTokenType.Null)
143139
return null;
144140

145-
146141
int rawValue = reader.GetInt32();
147142
RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue;
148143
return result;
149-
150144
}
151145

152146
/// <summary>

‎samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value)
8585
/// <exception cref="NotImplementedException"></exception>
8686
public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value)
8787
{
88-
8988
return (int) value;
90-
9189
}
9290
}
9391

@@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert
106104
/// <returns></returns>
107105
public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
108106
{
109-
110107
int rawValue = reader.GetInt32();
111108
RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue;
112109
return result;
113-
114110
}
115111

116112
/// <summary>
@@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso
142138
if (reader.TokenType == JsonTokenType.Null)
143139
return null;
144140

145-
146141
int rawValue = reader.GetInt32();
147142
RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue;
148143
return result;
149-
150144
}
151145

152146
/// <summary>

‎samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val
8585
/// <exception cref="NotImplementedException"></exception>
8686
public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value)
8787
{
88-
8988
return (int) value;
90-
9189
}
9290
}
9391

@@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon
106104
/// <returns></returns>
107105
public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
108106
{
109-
110107
int rawValue = reader.GetInt32();
111108
RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue;
112109
return result;
113-
114110
}
115111

116112
/// <summary>
@@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter :
142138
if (reader.TokenType == JsonTokenType.Null)
143139
return null;
144140

145-
146141
int rawValue = reader.GetInt32();
147142
RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue;
148143
return result;
149-
150144
}
151145

152146
/// <summary>

‎samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value
8585
/// <exception cref="NotImplementedException"></exception>
8686
public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value)
8787
{
88-
8988
if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1)
9089
return 1.1d;
9190

@@ -111,7 +110,6 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve
111110
/// <returns></returns>
112111
public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
113112
{
114-
115113
string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture);
116114
TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue);
117115
if (result != null)
@@ -148,7 +146,6 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J
148146
if (reader.TokenType == JsonTokenType.Null)
149147
return null;
150148

151-
152149
string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture);
153150
TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue);
154151
if (result != null)

0 commit comments

Comments
 (0)