Skip to content

Commit 999a253

Browse files
refactor(internal): JsonElement constant construction
1 parent fa02766 commit 999a253

File tree

217 files changed

+1955
-4337
lines changed

Some content is hidden

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

217 files changed

+1955
-4337
lines changed

src/Orb.Tests/Models/Alerts/AlertCreateForCustomerParamsTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void Validation_Works(Alerts::Type rawValue)
9999
public void InvalidEnumValidationThrows_Works()
100100
{
101101
var value = JsonSerializer.Deserialize<ApiEnum<string, Alerts::Type>>(
102-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
102+
JsonSerializer.SerializeToElement("invalid value"),
103103
ModelBase.SerializerOptions
104104
);
105105

@@ -129,7 +129,7 @@ public void SerializationRoundtrip_Works(Alerts::Type rawValue)
129129
public void InvalidEnumSerializationRoundtrip_Works()
130130
{
131131
var value = JsonSerializer.Deserialize<ApiEnum<string, Alerts::Type>>(
132-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
132+
JsonSerializer.SerializeToElement("invalid value"),
133133
ModelBase.SerializerOptions
134134
);
135135
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);

src/Orb.Tests/Models/Alerts/AlertCreateForExternalCustomerParamsTest.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,7 @@ public void InvalidEnumValidationThrows_Works()
104104
{
105105
var value = JsonSerializer.Deserialize<
106106
ApiEnum<string, AlertCreateForExternalCustomerParamsType>
107-
>(
108-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
109-
ModelBase.SerializerOptions
110-
);
107+
>(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
111108

112109
Assert.NotNull(value);
113110
Assert.Throws<OrbInvalidDataException>(() => value.Validate());
@@ -135,10 +132,7 @@ public void InvalidEnumSerializationRoundtrip_Works()
135132
{
136133
var value = JsonSerializer.Deserialize<
137134
ApiEnum<string, AlertCreateForExternalCustomerParamsType>
138-
>(
139-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
140-
ModelBase.SerializerOptions
141-
);
135+
>(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
142136
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
143137
var deserialized = JsonSerializer.Deserialize<
144138
ApiEnum<string, AlertCreateForExternalCustomerParamsType>

src/Orb.Tests/Models/Alerts/AlertCreateForSubscriptionParamsTest.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,7 @@ public void InvalidEnumValidationThrows_Works()
102102
{
103103
var value = JsonSerializer.Deserialize<
104104
ApiEnum<string, AlertCreateForSubscriptionParamsType>
105-
>(
106-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
107-
ModelBase.SerializerOptions
108-
);
105+
>(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
109106

110107
Assert.NotNull(value);
111108
Assert.Throws<OrbInvalidDataException>(() => value.Validate());
@@ -132,10 +129,7 @@ public void InvalidEnumSerializationRoundtrip_Works()
132129
{
133130
var value = JsonSerializer.Deserialize<
134131
ApiEnum<string, AlertCreateForSubscriptionParamsType>
135-
>(
136-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
137-
ModelBase.SerializerOptions
138-
);
132+
>(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
139133
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
140134
var deserialized = JsonSerializer.Deserialize<
141135
ApiEnum<string, AlertCreateForSubscriptionParamsType>

src/Orb.Tests/Models/Alerts/AlertTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ public void Validation_Works(AlertType rawValue)
473473
public void InvalidEnumValidationThrows_Works()
474474
{
475475
var value = JsonSerializer.Deserialize<ApiEnum<string, AlertType>>(
476-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
476+
JsonSerializer.SerializeToElement("invalid value"),
477477
ModelBase.SerializerOptions
478478
);
479479

@@ -505,7 +505,7 @@ public void SerializationRoundtrip_Works(AlertType rawValue)
505505
public void InvalidEnumSerializationRoundtrip_Works()
506506
{
507507
var value = JsonSerializer.Deserialize<ApiEnum<string, AlertType>>(
508-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
508+
JsonSerializer.SerializeToElement("invalid value"),
509509
ModelBase.SerializerOptions
510510
);
511511
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);

src/Orb.Tests/Models/AllocationTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public void Validation_Works(Field rawValue)
347347
public void InvalidEnumValidationThrows_Works()
348348
{
349349
var value = JsonSerializer.Deserialize<ApiEnum<string, Field>>(
350-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
350+
JsonSerializer.SerializeToElement("invalid value"),
351351
ModelBase.SerializerOptions
352352
);
353353

@@ -379,7 +379,7 @@ public void SerializationRoundtrip_Works(Field rawValue)
379379
public void InvalidEnumSerializationRoundtrip_Works()
380380
{
381381
var value = JsonSerializer.Deserialize<ApiEnum<string, Field>>(
382-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
382+
JsonSerializer.SerializeToElement("invalid value"),
383383
ModelBase.SerializerOptions
384384
);
385385
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
@@ -408,7 +408,7 @@ public void Validation_Works(Operator rawValue)
408408
public void InvalidEnumValidationThrows_Works()
409409
{
410410
var value = JsonSerializer.Deserialize<ApiEnum<string, Operator>>(
411-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
411+
JsonSerializer.SerializeToElement("invalid value"),
412412
ModelBase.SerializerOptions
413413
);
414414

@@ -437,7 +437,7 @@ public void SerializationRoundtrip_Works(Operator rawValue)
437437
public void InvalidEnumSerializationRoundtrip_Works()
438438
{
439439
var value = JsonSerializer.Deserialize<ApiEnum<string, Operator>>(
440-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
440+
JsonSerializer.SerializeToElement("invalid value"),
441441
ModelBase.SerializerOptions
442442
);
443443
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);

src/Orb.Tests/Models/AmountDiscountIntervalTest.cs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public void Validation_Works(AmountDiscountIntervalDiscountType rawValue)
195195
public void InvalidEnumValidationThrows_Works()
196196
{
197197
var value = JsonSerializer.Deserialize<ApiEnum<string, AmountDiscountIntervalDiscountType>>(
198-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
198+
JsonSerializer.SerializeToElement("invalid value"),
199199
ModelBase.SerializerOptions
200200
);
201201

@@ -222,7 +222,7 @@ public void SerializationRoundtrip_Works(AmountDiscountIntervalDiscountType rawV
222222
public void InvalidEnumSerializationRoundtrip_Works()
223223
{
224224
var value = JsonSerializer.Deserialize<ApiEnum<string, AmountDiscountIntervalDiscountType>>(
225-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
225+
JsonSerializer.SerializeToElement("invalid value"),
226226
ModelBase.SerializerOptions
227227
);
228228
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
@@ -339,7 +339,7 @@ public void Validation_Works(AmountDiscountIntervalFilterField rawValue)
339339
public void InvalidEnumValidationThrows_Works()
340340
{
341341
var value = JsonSerializer.Deserialize<ApiEnum<string, AmountDiscountIntervalFilterField>>(
342-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
342+
JsonSerializer.SerializeToElement("invalid value"),
343343
ModelBase.SerializerOptions
344344
);
345345

@@ -370,7 +370,7 @@ public void SerializationRoundtrip_Works(AmountDiscountIntervalFilterField rawVa
370370
public void InvalidEnumSerializationRoundtrip_Works()
371371
{
372372
var value = JsonSerializer.Deserialize<ApiEnum<string, AmountDiscountIntervalFilterField>>(
373-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
373+
JsonSerializer.SerializeToElement("invalid value"),
374374
ModelBase.SerializerOptions
375375
);
376376
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
@@ -399,10 +399,7 @@ public void InvalidEnumValidationThrows_Works()
399399
{
400400
var value = JsonSerializer.Deserialize<
401401
ApiEnum<string, AmountDiscountIntervalFilterOperator>
402-
>(
403-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
404-
ModelBase.SerializerOptions
405-
);
402+
>(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
406403

407404
Assert.NotNull(value);
408405
Assert.Throws<OrbInvalidDataException>(() => value.Validate());
@@ -429,10 +426,7 @@ public void InvalidEnumSerializationRoundtrip_Works()
429426
{
430427
var value = JsonSerializer.Deserialize<
431428
ApiEnum<string, AmountDiscountIntervalFilterOperator>
432-
>(
433-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
434-
ModelBase.SerializerOptions
435-
);
429+
>(JsonSerializer.SerializeToElement("invalid value"), ModelBase.SerializerOptions);
436430
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
437431
var deserialized = JsonSerializer.Deserialize<
438432
ApiEnum<string, AmountDiscountIntervalFilterOperator>

src/Orb.Tests/Models/AmountDiscountTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public void Validation_Works(DiscountType rawValue)
245245
public void InvalidEnumValidationThrows_Works()
246246
{
247247
var value = JsonSerializer.Deserialize<ApiEnum<string, DiscountType>>(
248-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
248+
JsonSerializer.SerializeToElement("invalid value"),
249249
ModelBase.SerializerOptions
250250
);
251251

@@ -273,7 +273,7 @@ public void SerializationRoundtrip_Works(DiscountType rawValue)
273273
public void InvalidEnumSerializationRoundtrip_Works()
274274
{
275275
var value = JsonSerializer.Deserialize<ApiEnum<string, DiscountType>>(
276-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
276+
JsonSerializer.SerializeToElement("invalid value"),
277277
ModelBase.SerializerOptions
278278
);
279279
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
@@ -391,7 +391,7 @@ public void Validation_Works(AmountDiscountFilterField rawValue)
391391
public void InvalidEnumValidationThrows_Works()
392392
{
393393
var value = JsonSerializer.Deserialize<ApiEnum<string, AmountDiscountFilterField>>(
394-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
394+
JsonSerializer.SerializeToElement("invalid value"),
395395
ModelBase.SerializerOptions
396396
);
397397

@@ -423,7 +423,7 @@ public void SerializationRoundtrip_Works(AmountDiscountFilterField rawValue)
423423
public void InvalidEnumSerializationRoundtrip_Works()
424424
{
425425
var value = JsonSerializer.Deserialize<ApiEnum<string, AmountDiscountFilterField>>(
426-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
426+
JsonSerializer.SerializeToElement("invalid value"),
427427
ModelBase.SerializerOptions
428428
);
429429
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);
@@ -452,7 +452,7 @@ public void Validation_Works(AmountDiscountFilterOperator rawValue)
452452
public void InvalidEnumValidationThrows_Works()
453453
{
454454
var value = JsonSerializer.Deserialize<ApiEnum<string, AmountDiscountFilterOperator>>(
455-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
455+
JsonSerializer.SerializeToElement("invalid value"),
456456
ModelBase.SerializerOptions
457457
);
458458

@@ -480,7 +480,7 @@ public void SerializationRoundtrip_Works(AmountDiscountFilterOperator rawValue)
480480
public void InvalidEnumSerializationRoundtrip_Works()
481481
{
482482
var value = JsonSerializer.Deserialize<ApiEnum<string, AmountDiscountFilterOperator>>(
483-
JsonSerializer.Deserialize<JsonElement>("\"invalid value\""),
483+
JsonSerializer.SerializeToElement("invalid value"),
484484
ModelBase.SerializerOptions
485485
);
486486
string json = JsonSerializer.Serialize(value, ModelBase.SerializerOptions);

0 commit comments

Comments
 (0)