Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/RestSharp.Serializers.Xml/XmlDeserializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ protected virtual object Map(object x, XElement? root) {
}
else if (type.IsPrimitive) {
try {
prop.SetValue(x, value.ChangeType(asType), null);
prop.SetValue(x, value.ChangeType(asType, Culture), null);
}
catch (FormatException ex) {
throw new FormatException(
Expand Down Expand Up @@ -444,7 +444,7 @@ IList<XElement> TryFindElementsByNameVariations(XElement source, string typeName
item = element.Value;
}
else if (t.GetTypeInfo().IsPrimitive) {
item = element.Value.ChangeType(t);
item = element.Value.ChangeType(t, Culture);
}
else {
item = Activator.CreateInstance(t)!;
Expand Down
2 changes: 1 addition & 1 deletion src/RestSharp/Extensions/ReflectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static bool IsSubclassOfRawGeneric(this Type? toCheck, Type generic) {
return false;
}

internal static object? ChangeType(this object? source, Type newType) => Convert.ChangeType(source, newType);
internal static object? ChangeType(this object? source, Type newType, IFormatProvider provider) => Convert.ChangeType(source, newType, provider);

/// <summary>
/// Find a value from a System.Enum by trying several possible variants
Expand Down
47 changes: 47 additions & 0 deletions test/RestSharp.Tests.Serializers.Xml/XmlDeserializerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1240,4 +1240,51 @@
Assert.Equal(2, topItem.SubItems[0].Id);
Assert.Equal(3, topItem.SubItems[1].Id);
}

[Theory]
[InlineData("tr-TR")]
[InlineData("de-DE")]
[InlineData("fr-FR")]
public void Should_deserialize_floating_point_numbers_with_invariant_culture_by_default(string currentCulture) {
const string xml = "<Root><Double>1234.5</Double><Float>2.5</Float><Numbers><Number>1.5</Number><Number>2.25</Number></Numbers></Root>";

var previous = CultureInfo.CurrentCulture;
CultureInfo.CurrentCulture = new CultureInfo(currentCulture);

try {
var result = new XmlDeserializer().Deserialize<FloatingPointValues>(new() { Content = xml })!;

Check warning on line 1255 in test/RestSharp.Tests.Serializers.Xml/XmlDeserializerTests.cs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this null-forgiving operator; nullable warnings are disabled here.

See more on https://sonarcloud.io/project/issues?id=restsharp_RestSharp&issues=AaHt3EpDYAQc5qJ3-Kea&open=AaHt3EpDYAQc5qJ3-Kea&pullRequest=2428

Assert.Equal(1234.5, result.Double);
Assert.Equal(2.5f, result.Float);
Assert.Equal(new[] { 1.5, 2.25 }, result.Numbers);
}
finally {
CultureInfo.CurrentCulture = previous;
}
}

[Fact]
public void Should_deserialize_floating_point_numbers_with_configured_culture() {
const string xml = "<Root><Double>1234,5</Double><Float>2,5</Float><Numbers><Number>1,5</Number><Number>2,25</Number></Numbers></Root>";

var previous = CultureInfo.CurrentCulture;
CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;

try {
var result = new XmlDeserializer { Culture = new CultureInfo("de-DE") }.Deserialize<FloatingPointValues>(new() { Content = xml })!;

Check warning on line 1274 in test/RestSharp.Tests.Serializers.Xml/XmlDeserializerTests.cs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this null-forgiving operator; nullable warnings are disabled here.

See more on https://sonarcloud.io/project/issues?id=restsharp_RestSharp&issues=AaHt3EpDYAQc5qJ3-Keb&open=AaHt3EpDYAQc5qJ3-Keb&pullRequest=2428

Assert.Equal(1234.5, result.Double);
Assert.Equal(2.5f, result.Float);
Assert.Equal(new[] { 1.5, 2.25 }, result.Numbers);
}
finally {
CultureInfo.CurrentCulture = previous;
}
}

class FloatingPointValues {
public double Double { get; set; }
public float Float { get; set; }
public List<double> Numbers { get; set; } = [];
}
}