Merge pull request #289 from ckadluba/refactor-SinkTraits

Refactoring and unit tests.

Author: ckadluba

src/Serilog.Sinks.MSSqlServer/GlobalSuppressions.cs

@@ -9,7 +9,7 @@
 [assembly: SuppressMessage("Security", "CA2100:Review SQL queries for security vulnerabilities", Justification = "Too hard to change. Accepted for now.", Scope = "namespaceanddescendants", Target = "Serilog.Sinks.MSSqlServer")]
 [assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.SetProperty.IfNotNull``1(System.String,Serilog.Sinks.MSSqlServer.SetProperty.PropertySetter{``0})")]
 [assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.Platform.SqlTableCreator.CreateTable(System.Data.DataTable)")]
-[assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform.SqlBulkBatchWriter.WriteBatch(System.Collections.Generic.IEnumerable{Serilog.Events.LogEvent},System.Data.DataTable)~System.Threading.Tasks.Task")]
+[assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.Platform.SqlBulkBatchWriter.WriteBatch(System.Collections.Generic.IEnumerable{Serilog.Events.LogEvent},System.Data.DataTable)~System.Threading.Tasks.Task")]
 [assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.Output.StandardColumnDataGenerator.ConvertPropertiesToXmlStructure(System.Collections.Generic.IEnumerable{System.Collections.Generic.KeyValuePair{System.String,Serilog.Events.LogEventPropertyValue}})~System.String")]
 [assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.Output.PropertiesColumnDataGenerator.TryChangeType(System.Object,System.Type,System.Object@)~System.Boolean")]
 [assembly: SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "Cannot be changed on public classes for backward compatibility reasons.", Scope = "namespaceanddescendants", Target = "Serilog.Sinks.MSSqlServer")]

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Dependencies/SinkDependencies.cs

@@ -1,7 +1,6 @@
 using Serilog.Sinks.MSSqlServer.Platform;
-using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform;
 
-namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Dependencies
+namespace Serilog.Sinks.MSSqlServer.Dependencies
 {
     internal class SinkDependencies
     {

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Dependencies/SinkDependenciesFactory.cs

@@ -3,9 +3,8 @@
 using Serilog.Sinks.MSSqlServer.Output;
 using Serilog.Sinks.MSSqlServer.Platform;
 using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
-using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform;
 
-namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Dependencies
+namespace Serilog.Sinks.MSSqlServer.Dependencies
 {
     internal static class SinkDependenciesFactory
     {

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerAuditSink.cs

@@ -16,9 +16,9 @@
 using Serilog.Core;
 using Serilog.Events;
 using Serilog.Formatting;
-using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Dependencies;
+using Serilog.Sinks.MSSqlServer.Dependencies;
+using Serilog.Sinks.MSSqlServer.Platform;
 using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
-using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform;
 
 namespace Serilog.Sinks.MSSqlServer
 {

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSink.cs

@@ -18,9 +18,9 @@
 using System.Threading.Tasks;
 using Serilog.Events;
 using Serilog.Formatting;
-using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Dependencies;
+using Serilog.Sinks.MSSqlServer.Dependencies;
+using Serilog.Sinks.MSSqlServer.Platform;
 using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
-using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform;
 using Serilog.Sinks.PeriodicBatching;
 
 namespace Serilog.Sinks.MSSqlServer

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticator.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.Azure.Services.AppAuthentication;
 
-namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
+namespace Serilog.Sinks.MSSqlServer.Platform
 {
     internal class AzureManagedServiceAuthenticator : IAzureManagedServiceAuthenticator
     {

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorStub.cs

@@ -4,7 +4,7 @@
 
 // This is an empty stub implementaion of IAzureManagedServiceAuthenticator for the target frameworks
 // that don't support Azure Managed Identities (net452, net461, netstandard2.0, netcoreapp2.0).
-namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
+namespace Serilog.Sinks.MSSqlServer.Platform
 {
     [SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Empty stub but has to implement interface therefore parameters are not used.")]
     internal class AzureManagedServiceAuthenticator : IAzureManagedServiceAuthenticator

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/IAzureManagedServiceAuthenticator.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
+namespace Serilog.Sinks.MSSqlServer.Platform
 {
     internal interface IAzureManagedServiceAuthenticator
     {

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlBulkBatchWriter.cs

@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using Serilog.Events;
 
-namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
+namespace Serilog.Sinks.MSSqlServer.Platform
 {
     internal interface ISqlBulkBatchWriter
     {

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlConnectionFactory.cs

@@ -1,6 +1,6 @@
-using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform.SqlClient;
+using Serilog.Sinks.MSSqlServer.Platform.SqlClient;
 
-namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
+namespace Serilog.Sinks.MSSqlServer.Platform
 {
     internal interface ISqlConnectionFactory
     {