delete ElasticSearch.Net dependency for formatter package (#234)

Author: Vadim Hatsura

src/Serilog.Formatting.Elasticsearch/ElasticsearchJsonFormatter.cs

@@ -18,8 +18,9 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+#if !NO_SERIALIZATION
 using System.Runtime.Serialization;
-using Elasticsearch.Net;
+#endif
 using Serilog.Events;
 using Serilog.Parsing;
 
@@ -30,7 +31,7 @@ namespace Serilog.Formatting.Elasticsearch
     /// </summary>
     public class ElasticsearchJsonFormatter : DefaultJsonFormatter
     {
-        readonly IElasticsearchSerializer _serializer;
+        readonly ISerializer _serializer;
         readonly bool _inlineFields;
         readonly bool _formatStackTraceAsArray;
 
@@ -77,7 +78,7 @@ public ElasticsearchJsonFormatter(
             string closingDelimiter = null,
             bool renderMessage = true,
             IFormatProvider formatProvider = null,
-            IElasticsearchSerializer serializer = null,
+            ISerializer serializer = null,
             bool inlineFields = false,
             bool renderMessageTemplate = true,
             bool formatStackTraceAsArray = false)
@@ -323,7 +324,7 @@ protected override void WriteLiteralValue(object value, TextWriter output)
         {
             if (_serializer != null)
             {
-                string jsonString = _serializer.SerializeToString(value, SerializationFormatting.None);
+                string jsonString = _serializer.SerializeToString(value);
                 output.Write(jsonString);
                 return;
             }

src/Serilog.Formatting.Elasticsearch/ExceptionAsObjectJsonFormatter.cs

@@ -15,7 +15,6 @@
 
 using System;
 using System.IO;
-using Elasticsearch.Net;
 
 namespace Serilog.Formatting.Elasticsearch
 {
@@ -48,7 +47,7 @@ public ExceptionAsObjectJsonFormatter(bool omitEnclosingObject = false,
             string closingDelimiter = null, 
             bool renderMessage = false, 
             IFormatProvider formatProvider = null, 
-            IElasticsearchSerializer serializer = null, 
+            ISerializer serializer = null, 
             bool inlineFields = false, 
             bool formatStackTraceAsArray = false) 
             : base(omitEnclosingObject, closingDelimiter, renderMessage, formatProvider, serializer, inlineFields, true, formatStackTraceAsArray)

src/Serilog.Formatting.Elasticsearch/ISerializer.cs

@@ -0,0 +1,15 @@
+namespace Serilog.Formatting.Elasticsearch
+{
+    /// <summary>
+    ///     Defines a method to serialize custom value to string
+    /// </summary>
+    public interface ISerializer
+    {
+        /// <summary>
+        ///     Serializes object to string
+        /// </summary>
+        /// <param name="value">Object to serialization</param>
+        /// <returns>String representation of object</returns>
+        string SerializeToString(object value);
+    }
+}

src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.ElasticSearch.Symbols.nuspec

@@ -11,13 +11,12 @@
     <iconUrl>http://serilog.net/images/serilog-sink-nuget.png</iconUrl>
     <tags>serilog logging elasticsearch</tags>
     <dependencies>
-       <dependency id="Serilog" version="2.6.0" />
-       <dependency id="Elasticsearch.Net" version="6.0.0" />
+       <dependency id="Serilog" version="2.8.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="bin\Release\Serilog.Sinks.Elasticsearch.dll" target="lib\net45" />
-    <file src="bin\Release\Serilog.Sinks.Elasticsearch.pdb" target="lib\net45" />
+    <file src="bin\Release\Serilog.Formatting.Elasticsearch.dll" target="lib\net45" />
+    <file src="bin\Release\Serilog.Formatting.Elasticsearch.pdb" target="lib\net45" />
     <file src="**\*.cs" target="src" />
   </files>
 </package>

src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.ElasticSearch.nuspec

@@ -12,8 +12,7 @@
     <repository type="git" url="https://github.com/serilog/serilog-sinks-elasticsearch" />
     <tags>serilog logging elasticsearch formatters</tags>
     <dependencies>
-      <dependency id="Serilog" version="2.6.0" />
-      <dependency id="Elasticsearch.Net" version="6.0.0" />
+      <dependency id="Serilog" version="2.8.0" />
     </dependencies>
   </metadata>
   <files>

src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.Elasticsearch.csproj

@@ -30,7 +30,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Elasticsearch.Net" Version="6.0.0" />
     <PackageReference Include="Serilog" Version="2.8.0" />
   </ItemGroup>
 

src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchSinkState.cs

@@ -93,7 +93,7 @@ public static ITextFormatter CreateDefaultFormatter(ElasticsearchSinkOptions opt
             return new ElasticsearchJsonFormatter(
                 formatProvider: options.FormatProvider,
                 closingDelimiter: string.Empty,
-                serializer: options.Serializer,
+                serializer: options.Serializer != null ? new SerializerAdapter(options.Serializer) : null,
                 inlineFields: options.InlineFields,
                 formatStackTraceAsArray: options.FormatStackTraceAsArray
             );
@@ -104,7 +104,7 @@ public static ITextFormatter CreateDefaultDurableFormatter(ElasticsearchSinkOpti
             return new ElasticsearchJsonFormatter(
                formatProvider: options.FormatProvider,
                closingDelimiter: Environment.NewLine,
-               serializer: options.Serializer,
+               serializer: options.Serializer != null ? new SerializerAdapter(options.Serializer) : null,
                inlineFields: options.InlineFields,
                formatStackTraceAsArray: options.FormatStackTraceAsArray
            );

src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/SerializerAdapter.cs

@@ -0,0 +1,59 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Elasticsearch.Net;
+using Serilog.Formatting.Elasticsearch;
+
+ namespace Serilog.Sinks.Elasticsearch
+{
+    internal class SerializerAdapter : ISerializer, IElasticsearchSerializer
+    {
+        private readonly IElasticsearchSerializer _elasticsearchSerializer;
+
+         internal SerializerAdapter(IElasticsearchSerializer elasticsearchSerializer)
+        {
+            _elasticsearchSerializer = elasticsearchSerializer ??
+                                       throw new ArgumentNullException(nameof(elasticsearchSerializer));
+        }
+
+         public object Deserialize(Type type, Stream stream)
+        {
+            return _elasticsearchSerializer.Deserialize(type, stream);
+        }
+
+         public T Deserialize<T>(Stream stream)
+        {
+            return _elasticsearchSerializer.Deserialize<T>(stream);
+        }
+
+         public Task<object> DeserializeAsync(Type type, Stream stream,
+            CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return _elasticsearchSerializer.DeserializeAsync(type, stream, cancellationToken);
+        }
+
+         public Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return _elasticsearchSerializer.DeserializeAsync<T>(stream, cancellationToken);
+        }
+
+         public void Serialize<T>(T data, Stream stream,
+            SerializationFormatting formatting = SerializationFormatting.Indented)
+        {
+            _elasticsearchSerializer.Serialize(data, stream, formatting);
+        }
+
+         public Task SerializeAsync<T>(T data, Stream stream,
+            SerializationFormatting formatting = SerializationFormatting.Indented,
+            CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return _elasticsearchSerializer.SerializeAsync(data, stream, formatting, cancellationToken);
+        }
+
+         public string SerializeToString(object value)
+        {
+            return _elasticsearchSerializer.SerializeToString(value, SerializationFormatting.None);
+        }
+    }
+}