Merge branch 'main' into netzlokation

Hochfrequenz · hf-kklein · Aug 18, 2024 · Nov 25, 2024 · Nov 25, 2024 · 75b1fb22a35512b0d417848f129f43322fa7f1d4
commit 75b1fb22a35512b0d417848f129f43322fa7f1d4
diff --git a/BO4E/BO/Netzlokation.cs b/BO4E/BO/Netzlokation.cs
@@ -20,7 +20,7 @@ public class Netzlokation : BusinessObject
     ///     verbraucht, oder erzeugt wird (Like MarktlokationsId <see cref="Marktlokation"/>)
     /// </summary>
     [DefaultValue("|null|")]
-    [JsonProperty(Required = Required.Default, Order = 10, PropertyName = "netzlokationsId")]
+    [JsonProperty(Order = 10, PropertyName = "netzlokationsId")]
     [JsonPropertyName("netzlokationsId")]
     [JsonPropertyOrder(10)]
     [DataCategory(DataCategory.POD)]
@@ -29,7 +29,7 @@ public class Netzlokation : BusinessObject
     public string? NetzlokationsId { get; set; }
 
     /// <summary>Sparte der Netzlokation, z.B. Gas oder Strom.</summary>
-    [JsonProperty(Required = Required.Default, Order = 11, PropertyName = "sparte")]
+    [JsonProperty(Order = 11, PropertyName = "sparte")]
     [JsonPropertyOrder(11)]
     [JsonPropertyName("sparte")]
     [ProtoMember(5)]

diff --git a/BO4ETestProject/TestSperrauftrag.cs b/BO4ETestProject/TestSperrauftrag.cs
    private readonly JsonSerializerOptions _options = new()
    {
        Converters = { new JsonStringEnumConverter() },
        IgnoreNullValues = true,
    };

    [TestMethod]
diff --git a/BO4ETestProject/TestJsonOrder.cs b/BO4ETestProject/TestJsonOrder.cs

        // BusinessObjects
        typeof(Auftrag),
        typeof(AuftragsStorno),
        typeof(Avis),
        typeof(Benachrichtigung),
        typeof(Berechnungsformel),
        typeof(PreisblattUmlagen),
        typeof(Region),
        typeof(Sperrauftrag),
        typeof(SperrauftragsStorno),
        // COMponents
        typeof(Abweichung),
        typeof(AufAbschlag),
diff --git a/BO4ETestProject/TestStringEnumConverter.cs b/BO4ETestProject/TestStringEnumConverter.cs
            settings
        );
        actual.Should().NotBeNull();
        actual.Foo.Should().Be(expectedGasqualitaet);

        var reSerializedJsonString = System.Text.Json.JsonSerializer.Serialize(actual, settings);
        reSerializedJsonString.Should().Contain(expectedGasqualitaet?.ToString() ?? "null");
            settings
        );
        actual.Should().NotBeNull();
        actual.Foo.Should().Be(expectedGasqualitaet);

        var reSerializedJsonString = System.Text.Json.JsonSerializer.Serialize(actual, settings);
        reSerializedJsonString.Should().Contain(expectedGasqualitaet.ToString());
            settings
        );
        actual.Should().NotBeNull();
        actual.Foo.Should().Be(expectedGasqualitaet);

        var reSerializedJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(actual, settings);
        reSerializedJsonString.Should().Contain(expectedGasqualitaet?.ToString() ?? "null");
                settings
            );
        actual.Should().NotBeNull();
        actual.Foo.Should().Be(expectedGasqualitaet);

        var reSerializedJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(actual, settings);
        reSerializedJsonString.Should().Contain(expectedGasqualitaet.ToString());
            settings
        );
        actual.Should().NotBeNull();
        actual.Foo.Should().Be(expectedGasqualitaet);

        var reSerializedJsonString = System.Text.Json.JsonSerializer.Serialize(actual, settings);
        reSerializedJsonString.Should().Contain(expectedGasqualitaet.ToString());
                settings
            );
        actual.Should().NotBeNull();
        actual.Foo.Should().Be(expectedGasqualitaet);

        var reSerializedJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(actual, settings);
        reSerializedJsonString.Should().Contain(expectedGasqualitaet.ToString());
            settings
        );
        actual.Should().NotBeNull();
        actual.Foo.Should().Be(expectedVerwendungszweck);

        var reSerializedJsonString = System.Text.Json.JsonSerializer.Serialize(actual, settings);
        reSerializedJsonString.Should().Contain(expectedVerwendungszweck?.ToString() ?? "null");
                settings
            );
        actual.Should().NotBeNull();
        actual.Foo.Should().Be(expectedVerwendungszweck);

        var reSerializedJsonString = System.Text.Json.JsonSerializer.Serialize(actual, settings);
        reSerializedJsonString.Should().Contain(expectedVerwendungszweck.ToString());
                settings
            );
        actual.Should().NotBeNull();
        actual.Foo.Should().Be(expectedVerwendungszweck);

        var reSerializedJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(actual, settings);
        reSerializedJsonString.Should().Contain(expectedVerwendungszweck?.ToString() ?? "null");
                settings
            );
        actual.Should().NotBeNull();
        actual.Foo.Should().Be(expectedVerwendungszweck);

        var reSerializedJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(actual, settings);
        reSerializedJsonString.Should().Contain(expectedVerwendungszweck.ToString());
	private readonly JsonSerializerOptions _options = new()
	{
	Converters = { new JsonStringEnumConverter() },
	IgnoreNullValues = true,
Check warning on line 22 in BO4ETestProject/TestSperrauftrag.cs GitHub Actions / unittest (9) `'JsonSerializerOptions.IgnoreNullValues' is obsolete: 'JsonSerializerOptions.IgnoreNullValues is obsolete. To ignore null values when serializing, set DefaultIgnoreCondition to JsonIgnoreCondition.WhenWritingNull.' (https://aka.ms/dotnet-warnings/SYSLIB0020)` Check warning on line 22 in BO4ETestProject/TestSperrauftrag.cs GitHub Actions / unittest (8.0.401) `'JsonSerializerOptions.IgnoreNullValues' is obsolete: 'JsonSerializerOptions.IgnoreNullValues is obsolete. To ignore null values when serializing, set DefaultIgnoreCondition to JsonIgnoreCondition.WhenWritingNull.' (https://aka.ms/dotnet-warnings/SYSLIB0020)` Check warning on line 22 in BO4ETestProject/TestSperrauftrag.cs GitHub Actions / pushfeature `'JsonSerializerOptions.IgnoreNullValues' is obsolete: 'JsonSerializerOptions.IgnoreNullValues is obsolete. To ignore null values when serializing, set DefaultIgnoreCondition to JsonIgnoreCondition.WhenWritingNull.' (https://aka.ms/dotnet-warnings/SYSLIB0020)` Check warning on line 22 in BO4ETestProject/TestSperrauftrag.cs GitHub Actions / pushfeature `'JsonSerializerOptions.IgnoreNullValues' is obsolete: 'JsonSerializerOptions.IgnoreNullValues is obsolete. To ignore null values when serializing, set DefaultIgnoreCondition to JsonIgnoreCondition.WhenWritingNull.' (https://aka.ms/dotnet-warnings/SYSLIB0020)`
	};

	[TestMethod]

	// BusinessObjects
	typeof(Auftrag),
	typeof(AuftragsStorno),
Check warning on line 42 in BO4ETestProject/TestJsonOrder.cs GitHub Actions / unittest (9) `'AuftragsStorno' is obsolete: 'This is not used in the implementation of the blocking process - we use the enum Auftragsstornogrund instead'` Check warning on line 42 in BO4ETestProject/TestJsonOrder.cs GitHub Actions / unittest (8.0.401) `'AuftragsStorno' is obsolete: 'This is not used in the implementation of the blocking process - we use the enum Auftragsstornogrund instead'` Check warning on line 42 in BO4ETestProject/TestJsonOrder.cs GitHub Actions / pushfeature `'AuftragsStorno' is obsolete: 'This is not used in the implementation of the blocking process - we use the enum Auftragsstornogrund instead'` Check warning on line 42 in BO4ETestProject/TestJsonOrder.cs GitHub Actions / pushfeature `'AuftragsStorno' is obsolete: 'This is not used in the implementation of the blocking process - we use the enum Auftragsstornogrund instead'`
	typeof(Avis),
	typeof(Benachrichtigung),
	typeof(Berechnungsformel),
	typeof(PreisblattUmlagen),
	typeof(Region),
	typeof(Sperrauftrag),
	typeof(SperrauftragsStorno),
Check warning on line 57 in BO4ETestProject/TestJsonOrder.cs GitHub Actions / unittest (9) `'SperrauftragsStorno' is obsolete: 'This is not used in the implementation of the blocking process - we use the enum Auftragsstornogrund instead'` Check warning on line 57 in BO4ETestProject/TestJsonOrder.cs GitHub Actions / unittest (8.0.401) `'SperrauftragsStorno' is obsolete: 'This is not used in the implementation of the blocking process - we use the enum Auftragsstornogrund instead'` Check warning on line 57 in BO4ETestProject/TestJsonOrder.cs GitHub Actions / pushfeature `'SperrauftragsStorno' is obsolete: 'This is not used in the implementation of the blocking process - we use the enum Auftragsstornogrund instead'` Check warning on line 57 in BO4ETestProject/TestJsonOrder.cs GitHub Actions / pushfeature `'SperrauftragsStorno' is obsolete: 'This is not used in the implementation of the blocking process - we use the enum Auftragsstornogrund instead'`
	// COMponents
	typeof(Abweichung),
	typeof(AufAbschlag),
	settings
	);
	actual.Should().NotBeNull();
	actual.Foo.Should().Be(expectedGasqualitaet);
Check warning on line 164 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 164 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 164 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 164 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 164 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.` Check warning on line 164 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.`

	var reSerializedJsonString = System.Text.Json.JsonSerializer.Serialize(actual, settings);
	reSerializedJsonString.Should().Contain(expectedGasqualitaet?.ToString() ?? "null");
	settings
	);
	actual.Should().NotBeNull();
	actual.Foo.Should().Be(expectedGasqualitaet);
Check warning on line 214 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 214 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 214 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 214 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 214 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.` Check warning on line 214 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.`

	var reSerializedJsonString = System.Text.Json.JsonSerializer.Serialize(actual, settings);
	reSerializedJsonString.Should().Contain(expectedGasqualitaet.ToString());
	settings
	);
	actual.Should().NotBeNull();
	actual.Foo.Should().Be(expectedGasqualitaet);
Check warning on line 270 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 270 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 270 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 270 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 270 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.` Check warning on line 270 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.`

	var reSerializedJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(actual, settings);
	reSerializedJsonString.Should().Contain(expectedGasqualitaet?.ToString() ?? "null");
	settings
	);
	actual.Should().NotBeNull();
	actual.Foo.Should().Be(expectedGasqualitaet);
Check warning on line 325 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 325 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 325 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 325 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 325 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.` Check warning on line 325 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.`

	var reSerializedJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(actual, settings);
	reSerializedJsonString.Should().Contain(expectedGasqualitaet.ToString());
	settings
	);
	actual.Should().NotBeNull();
	actual.Foo.Should().Be(expectedGasqualitaet);
Check warning on line 349 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 349 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 349 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 349 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 349 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.` Check warning on line 349 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.`

	var reSerializedJsonString = System.Text.Json.JsonSerializer.Serialize(actual, settings);
	reSerializedJsonString.Should().Contain(expectedGasqualitaet.ToString());
	settings
	);
	actual.Should().NotBeNull();
	actual.Foo.Should().Be(expectedGasqualitaet);
Check warning on line 378 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 378 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 378 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 378 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 378 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.` Check warning on line 378 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.`

	var reSerializedJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(actual, settings);
	reSerializedJsonString.Should().Contain(expectedGasqualitaet.ToString());
	settings
	);
	actual.Should().NotBeNull();
	actual.Foo.Should().Be(expectedVerwendungszweck);
Check warning on line 422 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 422 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 422 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 422 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.` Check warning on line 422 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.` Check warning on line 422 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / pushfeature `Dereference of a possibly null reference.`

	var reSerializedJsonString = System.Text.Json.JsonSerializer.Serialize(actual, settings);
	reSerializedJsonString.Should().Contain(expectedVerwendungszweck?.ToString() ?? "null");
	settings
	);
	actual.Should().NotBeNull();
	actual.Foo.Should().Be(expectedVerwendungszweck);
Check warning on line 455 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 455 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.`

	var reSerializedJsonString = System.Text.Json.JsonSerializer.Serialize(actual, settings);
	reSerializedJsonString.Should().Contain(expectedVerwendungszweck.ToString());
	settings
	);
	actual.Should().NotBeNull();
	actual.Foo.Should().Be(expectedVerwendungszweck);
Check warning on line 494 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 494 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.`

	var reSerializedJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(actual, settings);
	reSerializedJsonString.Should().Contain(expectedVerwendungszweck?.ToString() ?? "null");
	settings
	);
	actual.Should().NotBeNull();
	actual.Foo.Should().Be(expectedVerwendungszweck);
Check warning on line 523 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (9) `Dereference of a possibly null reference.` Check warning on line 523 in BO4ETestProject/TestStringEnumConverter.cs GitHub Actions / unittest (8.0.401) `Dereference of a possibly null reference.`

	var reSerializedJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(actual, settings);
	reSerializedJsonString.Should().Contain(expectedVerwendungszweck.ToString());