Code cleanup and reorganization.

Author: mo-esmp

src/Serilog.Ui.Core/IDataProviderOptionBuilder.cs

@@ -0,0 +1,16 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Serilog.Ui.Core
+{
+    public class DataProviderOptionsBuilder : IDataProviderOptionsBuilder
+    {
+        private readonly IServiceCollection _services;
+
+        public DataProviderOptionsBuilder(IServiceCollection services)
+        {
+            _services = services;
+        }
+
+        IServiceCollection IDataProviderOptionsBuilder.Services => _services;
+    }
+}

src/Serilog.Ui.Core/LogModel.cs renamed to src/Serilog.Ui.Core/Models/LogModel.cs

@@ -0,0 +1,9 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Serilog.Ui.Core
+{
+    public interface IDataProviderOptionsBuilder
+    {
+        IServiceCollection Services { get; }
+    }
+}

src/Serilog.Ui.Core/OptionsBuilder/DataProviderOptionsBuilder.cs

@@ -0,0 +1,11 @@
+namespace Serilog.Ui.Core
+{
+    public class RelationalDbOptions
+    {
+        public string ConnectionString { get; set; }
+
+        public string TableName { get; set; }
+
+        public string Schema { get; set; }
+    }
+}

src/Serilog.Ui.Core/OptionsBuilder/IDataProviderOptionsBuilder.cs

@@ -7,4 +7,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Models\" />
+  </ItemGroup>
 </Project>

src/Serilog.Ui.Core/OptionsBuilder/RelationalDbOptions.cs

@@ -7,7 +7,7 @@ namespace Serilog.Ui.MsSqlServerProvider
     public static class DataProviderOptionBuilderExtensions
     {
         public static void UseSqlServer(
-            this DataProviderOptionBuilder optionsBuilder,
+            this DataProviderOptionsBuilder optionsBuilder,
             string connectionString,
             string tableName,
             string schemaName = null
@@ -26,7 +26,7 @@ public static void UseSqlServer(
                 Schema = schemaName
             };
 
-            optionsBuilder.Services.AddSingleton(relationProvider);
+            ((IDataProviderOptionsBuilder)optionsBuilder).Services.AddSingleton(relationProvider);
         }
     }
 }

src/Serilog.Ui.Core/Serilog.Ui.Core.csproj

@@ -8,4 +8,8 @@
     <ProjectReference Include="..\Serilog.Ui.Core\Serilog.Ui.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Extensions\" />
+  </ItemGroup>
+
 </Project>

src/Serilog.Ui.MsSqlServerProvider/DataProviderOptionBuilderExtensions.cs renamed to src/Serilog.Ui.MsSqlServerProvider/Extensions/DataProviderOptionsBuilderExtensions.cs

@@ -6,9 +6,9 @@ namespace Serilog.Ui.MsSqlServerProvider
 {
     public class SqlServerDataProvider : IDataProvider
     {
-        private readonly SqlServerOptions _options;
+        private readonly RelationalDbOptions _options;
 
-        public SqlServerDataProvider(SqlServerOptions options)
+        public SqlServerDataProvider(RelationalDbOptions options)
         {
             _options = options;
         }