From d615281d93f4e03962dbadf9ee6a12287ff724b3 Mon Sep 17 00:00:00 2001
From: Martijn Laarman <mpdreamz@gmail.com>
Date: Wed, 6 May 2015 16:08:08 +0200
Subject: [PATCH] Added UsePrettyRequests() and PrettyJson() to
 connectionsettings

---
 .../Configuration/ConnectionConfiguration.cs  | 25 +++++++++++++++++++
 .../IConnectionConfigurationValues.cs         |  6 +++++
 .../RequestHandlers/RequestHandlerBase.cs     |  5 +++-
 .../ElasticsearchDefaultSerializer.cs         |  1 +
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/Elasticsearch.Net/Connection/Configuration/ConnectionConfiguration.cs b/src/Elasticsearch.Net/Connection/Configuration/ConnectionConfiguration.cs
index caf4cc45daf..93402c64642 100644
--- a/src/Elasticsearch.Net/Connection/Configuration/ConnectionConfiguration.cs
+++ b/src/Elasticsearch.Net/Connection/Configuration/ConnectionConfiguration.cs
@@ -87,6 +87,10 @@ public class ConnectionConfiguration<T> : IConnectionConfigurationValues, IHideO
 
 		private bool _usePrettyResponses;
 		bool IConnectionConfigurationValues.UsesPrettyResponses { get{ return _usePrettyResponses; } }
+
+		private bool _usePrettyRequests;
+		bool IConnectionConfigurationValues.UsesPrettyRequests { get{ return _usePrettyRequests; } }
+
 #if DEBUG
 		private bool _keepRawResponse = true;
 #else
@@ -153,6 +157,7 @@ public ConnectionConfiguration(IConnectionPool connectionPool)
 			this._connectionStatusHandler = this.ConnectionStatusDefaultHandler;
 			this._maximumAsyncConnections = 0;
 			this._connectionPool = connectionPool;
+			this._usePrettyRequests = true;
 		}
 
 		public ConnectionConfiguration(Uri uri = null) 
@@ -357,6 +362,26 @@ public T SetProxy(Uri proxyAdress, string username, string password)
 			return (T) this;
 		}
 
+		/// <summary>
+		/// Sets <see cref="UsePrettyRequests"/> and <see cref="UsePrettyResponses"/> in one go.
+		/// Whether we want to send and recieve formatted json
+		/// </summary>
+		/// <param name="b"></param>
+		/// <returns></returns>
+		public T PrettyJson(bool b = true)
+		{
+			return this.UsePrettyRequests(b).UsePrettyResponses(b);
+		}
+
+		/// <summary>
+		/// Defaults to true, wether to send formatted json to elasticsearch or not
+		/// </summary>
+		public T UsePrettyRequests(bool b = true)
+		{
+			this._usePrettyRequests = b;
+			return (T) this;
+		}
+
 		/// <summary>
 		/// Append ?pretty=true to requests, this helps to debug send and received json.
 		/// </summary>
diff --git a/src/Elasticsearch.Net/Connection/Configuration/IConnectionConfigurationValues.cs b/src/Elasticsearch.Net/Connection/Configuration/IConnectionConfigurationValues.cs
index 3de7bcebb29..c14530df9d6 100644
--- a/src/Elasticsearch.Net/Connection/Configuration/IConnectionConfigurationValues.cs
+++ b/src/Elasticsearch.Net/Connection/Configuration/IConnectionConfigurationValues.cs
@@ -96,6 +96,12 @@ public interface IConnectionConfigurationValues
 		/// </summary>
 		bool MetricsEnabled { get; }
 
+		/// <summary>
+		/// Forces the client to pretty format the requests send to elasticsearch
+		/// defaults to true;
+		/// </summary>
+		bool UsesPrettyRequests { get; }
+
 		/// <summary>
 		/// Forces elasticsearch to send pretty json responses over the wire
 		/// </summary>
diff --git a/src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandlerBase.cs b/src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandlerBase.cs
index 49f471c7360..8741cef3ffd 100644
--- a/src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandlerBase.cs
+++ b/src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandlerBase.cs
@@ -60,7 +60,10 @@ protected byte[] PostData(object data)
 			if (ss != null) return (string.Join("\n", ss) + "\n").Utf8Bytes();
 
 			var so = data as IEnumerable<object>;
-			if (so == null) return this._serializer.Serialize(data);
+			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();
diff --git a/src/Elasticsearch.Net/Serialization/ElasticsearchDefaultSerializer.cs b/src/Elasticsearch.Net/Serialization/ElasticsearchDefaultSerializer.cs
index b3440099920..92428e3e53a 100644
--- a/src/Elasticsearch.Net/Serialization/ElasticsearchDefaultSerializer.cs
+++ b/src/Elasticsearch.Net/Serialization/ElasticsearchDefaultSerializer.cs
@@ -27,6 +27,7 @@ public T Deserialize<T>(Stream stream)
 				return SimpleJson.DeserializeObject<T>(buffer.Utf8String());
 			}
 		}
+
 		public Task<T> DeserializeAsync<T>(Stream stream)
 		{
 			var tcs = new TaskCompletionSource<T>();