Skip to content

Align serialization with NEST 2.0 implementation #1804

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

Merged
merged 1 commit into from
Feb 5, 2016
Merged

Align serialization with NEST 2.0 implementation #1804

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
24 changes: 17 additions & 7 deletions src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandlerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,27 @@ protected byte[] PostData(object data)
var s = data as string;
if (s != null) return s.Utf8Bytes();

var ss = data as IEnumerable<string>;
if (ss != null) return (string.Join("\n", ss) + "\n").Utf8Bytes();
var dataType = data.GetType();

if (typeof(IEnumerable<string>).IsAssignableFrom(dataType))
{
var ss = (IEnumerable<string>)data;
return (string.Join("\n", ss) + "\n").Utf8Bytes();
}

if (typeof(IEnumerable<object>).IsAssignableFrom(dataType))
{
var so = (IEnumerable<object>)data;
var joined = string.Join("\n", so
.Select(soo => this._serializer.Serialize(soo, SerializationFormatting.None).Utf8String())) + "\n";
return joined.Utf8Bytes();
}

var so = data as IEnumerable<object>;
var indent = this._settings.UsesPrettyRequests
? SerializationFormatting.Indented
: SerializationFormatting.None;
if (so == null) return this._serializer.Serialize(data, indent);
var joined = string.Join("\n", so
.Select(soo => this._serializer.Serialize(soo, SerializationFormatting.None).Utf8String())) + "\n";
return joined.Utf8Bytes();

return this._serializer.Serialize(data, indent);
}

protected static bool IsValidResponse(ITransportRequestState requestState, IElasticsearchResponse streamResponse)
Expand Down