ElasticsearchResponse .ToString() will now show the response only when possible

Author: Mpdreamz

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -274,12 +274,11 @@ private ElasticsearchResponse<T> WebToElasticsearchResponse<T>(byte[] data, obje
 						this.SetByteResult(cs as ElasticsearchResponse<byte[]>, bytes);
 						return cs;
 					}
-					cs.ResponseRaw = bytes;
+					cs.ResponseRaw = _ConnectionSettings.KeepRawResponse ? bytes: null;
 				}
 
 				var result = this._ConnectionSettings.Serializer.Deserialize<T>(cs, s, deserializationState);
 				cs.Response = result;
-				cs.ResponseRaw = memoryStream.ToArray();
 				tracer.SetResult(cs);
 				return cs;
 			}
@@ -384,20 +383,20 @@ private IEnumerable<Task> _AsyncSteps<T>(HttpWebRequest request, TaskCompletionS
 						}
 						memoryStream.Position = 0;
 						s = memoryStream;
-						cs.ResponseRaw = memoryStream.ToArray();
+						var bytes = memoryStream.ToArray();
 						if (typeof(T) == typeof(string))
 						{
-							this.SetStringResult(cs as ElasticsearchResponse<string>, cs.ResponseRaw);
+							this.SetStringResult(cs as ElasticsearchResponse<string>, bytes);
 							SetReturnOnAsycActors(tcs, cs, tracer);
 							yield break;
 						}
 						if (typeof(T) == typeof(byte[]))
 						{
-							this.SetByteResult(cs as ElasticsearchResponse<byte[]>, cs.ResponseRaw);
+							this.SetByteResult(cs as ElasticsearchResponse<byte[]>, bytes);
 							SetReturnOnAsycActors(tcs, cs, tracer);
 							yield break;
 						}
-
+						cs.ResponseRaw = _ConnectionSettings.KeepRawResponse ? bytes : null;
 					}
 					var t = this._ConnectionSettings.Serializer.DeserializeAsync<T>(cs, s, deserializationState);
 					yield return t;

src/Elasticsearch.Net/Domain/ElasticsearchResponse.cs

@@ -1,4 +1,5 @@
 using System;
+using System.CodeDom;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Globalization;
@@ -185,13 +186,21 @@ public override string ToString()
 		{
 			var r = this;
 			var e = r.Error;
+			string response = "<Response not captured or already read to completion by serializer>";
+			if (typeof(T) == typeof(string))
+				response = this.Response as string;
+			else if (this.Settings.KeepRawResponse)
+				response = this.ResponseRaw.Utf8String();
+			else if (typeof(T) == typeof(byte[]))
+				response = (this.Response as byte[]).Utf8String();
+
 			var print = _printFormat.F(
 			  Environment.NewLine,
 			  r.HttpStatusCode.HasValue ? r.HttpStatusCode.Value.ToString(CultureInfo.InvariantCulture) : "-1",
 			  r.RequestMethod,
 			  r.RequestUrl,
 			  r.Request,
-			  "RESPONSE STREAM ALREADY READ BY SERIALIZER"
+			  response
 			);
 			if (!this.Success)
 			{