Skip to content

Commit f1c15f1

Browse files
JanRhijnAkzoJanRhijnAkzo
committed
Do not check for token type null
1 parent f1c1567 commit f1c15f1

1 file changed

Lines changed: 11 additions & 22 deletions

File tree

‎modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -185,52 +185,43 @@
185185
{{/isMap}}
186186
{{/isString}}
187187
{{#isBoolean}}
188-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
189-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.GetBoolean());
188+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.TokenType == JsonTokenType.Null ? null : utf8JsonReader.GetBoolean());
190189
{{/isBoolean}}
191190
{{#isNumeric}}
192191
{{^isEnum}}
193192
{{#isDouble}}
194-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
195-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.GetDouble());
193+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.TokenType == JsonTokenType.Null ? null : utf8JsonReader.GetDouble());
196194
{{/isDouble}}
197195
{{#isDecimal}}
198-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
199-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.GetDecimal());
196+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.TokenType == JsonTokenType.Null ? null : utf8JsonReader.GetDecimal());
200197
{{/isDecimal}}
201198
{{#isFloat}}
202-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
203-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}(float)utf8JsonReader.GetDouble());
199+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.TokenType == JsonTokenType.Null ? null : (float)utf8JsonReader.GetDouble());
204200
{{/isFloat}}
205201
{{#isLong}}
206-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
207-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int64());
202+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.TokenType == JsonTokenType.Null ? null : utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int64());
208203
{{/isLong}}
209204
{{^isLong}}
210205
{{^isFloat}}
211206
{{^isDecimal}}
212207
{{^isDouble}}
213-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
214-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32());
208+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.TokenType == JsonTokenType.Null ? null : utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32());
215209
{{/isDouble}}
216210
{{/isDecimal}}
217211
{{/isFloat}}
218212
{{/isLong}}
219213
{{/isEnum}}
220214
{{/isNumeric}}
221215
{{#isDate}}
222-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
223-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}JsonSerializer.Deserialize<{{#supportsDateOnly}}DateOnly{{/supportsDateOnly}}{{^supportsDateOnly}}DateTime{{/supportsDateOnly}}{{#isNullable}}?{{/isNullable}}>(ref utf8JsonReader, jsonSerializerOptions));
216+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}JsonSerializer.Deserialize<{{#supportsDateOnly}}DateOnly{{/supportsDateOnly}}{{^supportsDateOnly}}DateTime{{/supportsDateOnly}}{{#isNullable}}?{{/isNullable}}>(ref utf8JsonReader, jsonSerializerOptions));
224217
{{/isDate}}
225218
{{#isDateTime}}
226-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
227-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}JsonSerializer.Deserialize<DateTime{{#isNullable}}?{{/isNullable}}>(ref utf8JsonReader, jsonSerializerOptions));
219+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}JsonSerializer.Deserialize<DateTime{{#isNullable}}?{{/isNullable}}>(ref utf8JsonReader, jsonSerializerOptions));
228220
{{/isDateTime}}
229221
{{#isEnum}}
230222
{{^isMap}}
231223
{{#isNumeric}}
232-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
233-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}({{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}})utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32());
224+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}({{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}})utf8JsonReader.TokenType == JsonTokenType.Null ? null : utf8JsonReader.Get{{#vendorExtensions.x-unsigned}}U{{/vendorExtensions.x-unsigned}}Int32());
234225
{{/isNumeric}}
235226
{{^isNumeric}}
236227
string{{nrt?}} {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue = utf8JsonReader.GetString();
@@ -246,8 +237,7 @@
246237
{{/isMap}}
247238
{{/isEnum}}
248239
{{#isUuid}}
249-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
250-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.GetGuid());
240+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}utf8JsonReader.TokenType == JsonTokenType.Null ? null : utf8JsonReader.GetGuid());
251241
{{/isUuid}}
252242
{{^isUuid}}
253243
{{^isEnum}}
@@ -256,8 +246,7 @@
256246
{{^isNumeric}}
257247
{{^isDate}}
258248
{{^isDateTime}}
259-
if (utf8JsonReader.TokenType != JsonTokenType.Null)
260-
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}JsonSerializer.Deserialize<{{{datatypeWithEnum}}}>(ref utf8JsonReader, jsonSerializerOptions){{^isNullable}}{{nrt!}}{{/isNullable}});
249+
{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}JsonSerializer.Deserialize<{{{datatypeWithEnum}}}>(ref utf8JsonReader, jsonSerializerOptions){{^isNullable}}{{nrt!}}{{/isNullable}});
261250
{{/isDateTime}}
262251
{{/isDate}}
263252
{{/isNumeric}}

0 commit comments

Comments
 (0)