Lazily resolve JsonSerializers in JsonNetSerializer

src/Nest/CommonAbstractions/SerializationBehavior/JsonNetSerializer.cs

@@ -19,40 +19,41 @@ public class JsonNetSerializer : IElasticsearchSerializer
 		protected ElasticContractResolver ContractResolver { get; }
 
 		//todo this internal smells
-		internal JsonSerializer Serializer => _defaultSerializer;
+		internal JsonSerializer Serializer => _defaultSerializer.Value;
 
-		private readonly Dictionary<SerializationFormatting, JsonSerializer> _defaultSerializers;
-		private readonly JsonSerializer _defaultSerializer;
+		private readonly Lazy<Dictionary<SerializationFormatting, JsonSerializer>> _defaultSerializers;
+		private readonly Lazy<JsonSerializer> _defaultSerializer;
 
 		protected virtual void ModifyJsonSerializerSettings(JsonSerializerSettings settings) { }
 		protected virtual IList<Func<Type, JsonConverter>> ContractConverters => null;
 
 		public JsonNetSerializer(IConnectionSettingsValues settings) : this(settings, null) { }
 
 		/// <summary>
-		/// this constructor is only here for stateful (de)serialization 
+		/// this constructor is only here for stateful (de) serialization
 		/// </summary>
 		internal JsonNetSerializer(IConnectionSettingsValues settings, JsonConverter stateFullConverter)
 		{
 			this.Settings = settings;
 			var piggyBackState = stateFullConverter == null ? null : new JsonConverterPiggyBackState { ActualJsonConverter = stateFullConverter };
+
 			// ReSharper disable once VirtualMemberCallInContructor
 			this.ContractResolver = new ElasticContractResolver(this.Settings, this.ContractConverters) { PiggyBackState = piggyBackState };
 
-			this._defaultSerializer = JsonSerializer.Create(this.CreateSettings(SerializationFormatting.None));
-			//this._defaultSerializer.Formatting = Formatting.None; 
-			var indentedSerializer = JsonSerializer.Create(this.CreateSettings(SerializationFormatting.Indented));
-			//indentedSerializer.Formatting = Formatting.Indented; 
-			this._defaultSerializers = new Dictionary<SerializationFormatting, JsonSerializer>
+			this._defaultSerializer = new Lazy<JsonSerializer>(() => JsonSerializer.Create(this.CreateSettings(SerializationFormatting.None)));
+
+			var indentedSerializer = new Lazy<JsonSerializer>(() => JsonSerializer.Create(this.CreateSettings(SerializationFormatting.Indented)));
+
+			this._defaultSerializers = new Lazy<Dictionary<SerializationFormatting, JsonSerializer>>(() => new Dictionary<SerializationFormatting, JsonSerializer>()
 			{
-				{ SerializationFormatting.None, this._defaultSerializer },
-				{ SerializationFormatting.Indented, indentedSerializer }
-			};
+				{ SerializationFormatting.None, this._defaultSerializer.Value },
+				{ SerializationFormatting.Indented, indentedSerializer.Value }
+			});
 		}
 
 		public virtual void Serialize(object data, Stream writableStream, SerializationFormatting formatting = SerializationFormatting.Indented)
 		{
-			var serializer = _defaultSerializers[formatting];
+			var serializer = _defaultSerializers.Value[formatting];
 			using (var writer = new StreamWriter(writableStream, ExpectedEncoding, 8096, leaveOpen: true))
 			using (var jsonWriter = new JsonTextWriter(writer))
 			{
@@ -87,7 +88,7 @@ public virtual T Deserialize<T>(Stream stream)
 			using (var streamReader = new StreamReader(stream))
 			using (var jsonTextReader = new JsonTextReader(streamReader))
 			{
-				var t = this._defaultSerializer.Deserialize(jsonTextReader, typeof(T));
+				var t = this.Serializer.Deserialize(jsonTextReader, typeof(T));
 				return (T)t;
 			}
 		}
@@ -117,4 +118,4 @@ private JsonSerializerSettings CreateSettings(SerializationFormatting formatting
 			return settings;
 		}
 	}
-}
+}

src/Tests/ClientConcepts/LowLevel/Connecting.doc.cs

@@ -274,11 +274,23 @@ public void ConfiguringSSL()
 		*/
 		public class MyJsonNetSerializer : JsonNetSerializer
 		{
-			public MyJsonNetSerializer(IConnectionSettingsValues settings) : base(settings) { }
+			private int _maxDepth;
+
+			public MyJsonNetSerializer(IConnectionSettingsValues settings, int maxDepth)
+				: base(settings)
+			{
+				this._maxDepth = maxDepth;
+			}
 
 			public int CallToModify { get; set; } = 0;
 
-			protected override void ModifyJsonSerializerSettings(JsonSerializerSettings settings) => ++CallToModify; //<1> Override ModifyJsonSerializerSettings if you need access to `JsonSerializerSettings`
+			public int SetMaxDepth { get; set; }
+
+			protected override void ModifyJsonSerializerSettings(JsonSerializerSettings settings)
+			{
+				++CallToModify;
+				SetMaxDepth = _maxDepth;
+			} //<1> Override ModifyJsonSerializerSettings if you need access to `JsonSerializerSettings`
 
 			public int CallToContractConverter { get; set; } = 0;
 
@@ -300,7 +312,8 @@ public MyJsonNetSerializer(IConnectionSettingsValues settings) : base(settings)
 		public void ModifyJsonSerializerSettingsIsCalled()
 		{
 			var connectionPool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
-			var settings = new ConnectionSettings(connectionPool, new InMemoryConnection(), s => new MyJsonNetSerializer(s));
+			var maxDepth = 8;
+			var settings = new ConnectionSettings(connectionPool, new InMemoryConnection(), s => new MyJsonNetSerializer(s, maxDepth));
 			var client = new ElasticClient(settings);
 			client.RootNodeInfo();
 			client.RootNodeInfo();
@@ -309,6 +322,7 @@ public void ModifyJsonSerializerSettingsIsCalled()
 
 			serializer.SerializeToString(new Project { });
 			serializer.CallToContractConverter.Should().BeGreaterThan(0);
+			serializer.SetMaxDepth.Should().Be(maxDepth);
 		}
 	}
 }