Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust serializer selection fallback procedure #2147

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Adjust serializer selection fallback procedure #2147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions src/RestSharp/Serializers/RestSerializers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,24 @@ internal RestResponse<T> Deserialize<T>(RestRequest request, RestResponse raw, R
if (string.IsNullOrWhiteSpace(response.Content)) return null;

var contentType = response.ContentType ?? DetectContentType()?.Value;
if (contentType == null) return null;

if (contentType == null) {
Serializers.TryGetValue(response.Request.RequestFormat, out var serializerByRequestFormat);
return serializerByRequestFormat?.GetSerializer().Deserializer;
}

var serializer = Serializers.Values.FirstOrDefault(x => x.SupportsContentType(contentType));

var factory = serializer ??
(Serializers.ContainsKey(response.Request.RequestFormat) ? Serializers[response.Request.RequestFormat] : null);
return factory?.GetSerializer().Deserializer;
if (serializer == null) {
var detectedType = DetectContentType()?.Value;

if (detectedType != null && detectedType != contentType)
{
serializer = Serializers.Values.FirstOrDefault(x => x.SupportsContentType(detectedType));
}
}

return serializer?.GetSerializer().Deserializer;

ContentType? DetectContentType()
=> response.Content![0] switch {
Expand Down
Loading