Move a few classes to NBi.Extensibility and uniformize the classes fo…

…r EtlRunner and BatchRunner

NBi.Core/Assemblies/AssemblyManager.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Reflection;
 using System.IO;
+using NBi.Extensibility;
 
 namespace NBi.Core.Assemblies
 {

NBi.Core/Assemblies/Decoration/AbstractCustomFactory.cs

@@ -1,4 +1,5 @@
 using NBi.Core.Scalar.Resolver;
+using NBi.Extensibility;
 using NBi.Extensibility.Decoration;
 using System;
 using System.Collections.Generic;

NBi.Core/Assemblies/Decoration/ICustomCommandArgs.cs

@@ -1,5 +1,7 @@
 using NBi.Core.Decoration;
 using NBi.Core.Scalar.Resolver;
+using NBi.Extensibility;
+using NBi.Extensibility.Decoration;
 using System;
 using System.Collections.Generic;
 using System.Linq;

NBi.Core/CommandTimeoutException.cs

@@ -3,6 +3,7 @@
 using System.Data.SqlClient;
 using Microsoft.AnalysisServices.AdomdClient;
 using System.Data;
+using NBi.Extensibility;
 
 namespace NBi.Core
 {

NBi.Core/ConnectionException.cs

@@ -2,6 +2,7 @@
 using System.Data.OleDb;
 using System.Data.SqlClient;
 using Microsoft.AnalysisServices.AdomdClient;
+using NBi.Extensibility;
 
 namespace NBi.Core
 {

NBi.Core/Decoration/DataEngineering/Commands/ConnectionWaitCommand.cs

@@ -1,4 +1,5 @@
 using NBi.Core.Query.Client;
+using NBi.Extensibility;
 using System;
 using System.Collections.Generic;
 using System.Data;

NBi.Core/Decoration/DataEngineering/Commands/SqlServer/BatchRunCommand.cs

@@ -1,5 +1,5 @@
 using NBi.Core.Query.Client;
-using NBi.Extensibility.DataEngineering;
+using NBi.Core.Decoration.DataEngineering;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -18,38 +18,20 @@ class BatchRunCommand : IDecorationCommand
 
         public BatchRunCommand(IBatchRunCommandArgs args) => this.args = args;
 
-        public void Execute() => Execute(PathExtensions.CombineOrRoot(args.BasePath, args.Path.Execute(), args.Name.Execute()), args.Version.Execute(), args.ConnectionString);
+        public void Execute() 
+            => Execute(
+                PathExtensions.CombineOrRoot(args.BasePath, args.Path.Execute(), args.Name.Execute())
+                , args.Version.Execute()
+                , args.ConnectionString
+            );
 
-        public void Execute(string fullPath, string version, string connectionString)
-        { 
-            var directory = AssemblyDirectory;
-            var filename = $"NBi.Core.{version}.dll";
-            var filepath = $"{directory}\\{filename}";
-            if (!File.Exists(filepath))
-                throw new InvalidOperationException($"Can't find the dll for version '{version}' in '{directory}'. NBi was expecting to find a dll named '{filename}'.");
-
-            var assembly = Assembly.LoadFrom(filepath);
-            var types = assembly.GetTypes()
-                            .Where(m => m.IsClass && m.GetInterface("IBatchRunCommand") != null);
-
-            if (types.Count() == 0)
-                throw new InvalidOperationException(string.Format("Can't find a class implementing 'IBatchRunCommand' in '{0}'.", assembly.FullName));
-            if (types.Count() > 1)
-                throw new InvalidOperationException(string.Format("Found more than one class implementing 'IBatchRunCommand' in '{0}'.", assembly.FullName));
-
-            var batchRunCommand = Activator.CreateInstance(types.ElementAt(0)) as IBatchRunCommand;
-            batchRunCommand.Execute(fullPath, new SqlConnection(args.ConnectionString));
-        }
-
-        private static string AssemblyDirectory
+        protected void Execute(string fullPath, string version, string connectionString)
         {
-            get
-            {
-                string codeBase = Assembly.GetExecutingAssembly().CodeBase;
-                UriBuilder uri = new UriBuilder(codeBase);
-                string path = Uri.UnescapeDataString(uri.Path);
-                return Path.GetDirectoryName(path);
-            }
+            var provider = new BatchRunnerProvider();
+            var factory = provider.Instantiate(version);
+            var args = new BatchRunnerArgs() { FullPath = fullPath, ConnectionString = connectionString };
+            var runner = factory.Instantiate(args);
+            runner.Execute();
         }
     }
 }

NBi.Core/Decoration/DataEngineering/Commands/SqlServer/BatchRunnerArgs.cs

@@ -0,0 +1,15 @@
+using NBi.Extensibility.Decoration.DataEngineering;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NBi.Core.Decoration.DataEngineering.Commands.SqlServer
+{
+    class BatchRunnerArgs : IBatchRunnerArgs
+    {
+        public string FullPath { get; set; }
+        public string ConnectionString { get; set; }
+    }
+}

NBi.Core/Decoration/DataEngineering/Commands/SqlServer/BatchRunnerProvider.cs

@@ -0,0 +1,46 @@
+using NBi.Extensibility.Decoration.DataEngineering;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NBi.Core.Decoration.DataEngineering
+{
+    class BatchRunnerProvider
+    {
+        public IBatchRunnerFactory Instantiate(string version)
+        {
+            var directory = AssemblyDirectory;
+            var filename = $"NBi.Core.{version}.dll";
+            var filepath = $"{directory}\\{filename}";
+            if (!File.Exists(filepath))
+                throw new InvalidOperationException($"Can't find the dll for version '{version}' in '{directory}'. NBi was expecting to find a dll named '{filename}'.");
+
+            var assembly = Assembly.LoadFrom(filepath);
+            var types = assembly.GetTypes()
+                            .Where(m => m.IsClass && m.GetInterface(typeof(IBatchRunnerFactory).Name) != null);
+
+            if (types.Count() == 0)
+                throw new InvalidOperationException($"Can't find a class implementing '{typeof(IBatchRunnerFactory).Name}' in '{assembly.FullName}'.");
+            if (types.Count() > 1)
+                throw new InvalidOperationException($"Found more than one class implementing '{typeof(IBatchRunnerFactory).Name}' in '{assembly.FullName}'.");
+
+            return Activator.CreateInstance(types.ElementAt(0)) as IBatchRunnerFactory;
+        }
+
+        private static string AssemblyDirectory
+        {
+            get
+            {
+                string codeBase = Assembly.GetExecutingAssembly().CodeBase;
+                UriBuilder uri = new UriBuilder(codeBase);
+                string path = Uri.UnescapeDataString(uri.Path);
+                return Path.GetDirectoryName(path);
+            }
+        }
+    }
+}

NBi.Core/Decoration/DataEngineering/Commands/SqlServer/BulkLoadCommand.cs

@@ -22,7 +22,7 @@ internal void Execute(string connectionString, string tableName, string filename
             {
                 // make sure to enable triggers
                 // more on triggers in next post
-                SqlBulkCopy bulkCopy =
+                using (var bulkCopy =
                     new SqlBulkCopy
                     (
                         connection,
@@ -33,15 +33,18 @@ internal void Execute(string connectionString, string tableName, string filename
                     {
                         // set the destination table name
                         DestinationTableName = tableName
-                    };
-                connection.Open();
+                    }
+                )
+                {
+                    connection.Open();
 
-                // write the data in the "dataTable"
-                var fileReader = new CsvReader();
-                var dataTable = fileReader.ToDataTable(filename, false);
-                bulkCopy.WriteToServer(dataTable);
+                    // write the data in the "dataTable"
+                    var fileReader = new CsvReader();
+                    var dataTable = fileReader.ToDataTable(filename, false);
+                    bulkCopy.WriteToServer(dataTable);
 
-                connection.Close();
+                    connection.Close();
+                }
             }
 
         }

NBi.Core/Decoration/DataEngineering/Commands/SqlServer/EtlRunCommand.cs

@@ -1,9 +1,10 @@
 using NBi.Core.Etl;
-using NBi.Extensibility.DataEngineering;
+using NBi.Core.Decoration.DataEngineering;
 using System;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using NBi.Extensibility.Decoration.DataEngineering;
 
 namespace NBi.Core.Decoration.DataEngineering
 {
@@ -18,8 +19,9 @@ public class EtlRunCommand : IDecorationCommand
         protected void Execute(IEtlArgs args)
         {
             var provider = new EtlRunnerProvider();
-            var etl = provider.Instantiate(args);
-            etl.Execute(); 
+            var factory = provider.Instantiate(args.Version);
+            var runner = factory.Instantiate(args);
+            runner.Execute(); 
         }
     }
 }

NBi.Extensibility/DataEngineering/IBatchRunCommand.cs → NBi.Core/Decoration/DataEngineering/Commands/SqlServer/IBatchRunCommand.cs

@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NBi.Extensibility.DataEngineering
+namespace NBi.Core.Decoration.DataEngineering
 {
     public interface IBatchRunCommand
     {

NBi.Core/Decoration/DataEngineering/IConnectionWaitCommandArgs.cs

@@ -1,4 +1,5 @@
-using System;
+using NBi.Core.Decoration.DataEngineering;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

NBi.Core/Decoration/DataEngineering/IDataEngineeringCommandArgs.cs

@@ -1,5 +1,4 @@
-using NBi.Core.Decoration;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

NBi.Core/Decoration/DataEngineering/IEtlRunCommandArgs.cs

@@ -1,16 +1,16 @@
 using NBi.Core.Etl;
 using NBi.Core.Scalar.Resolver;
-using NBi.Extensibility.DataEngineering;
+using NBi.Core.Decoration.DataEngineering;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using NBi.Extensibility.Decoration.DataEngineering;
 
 namespace NBi.Core.Decoration.DataEngineering
 {
     public interface IEtlRunCommandArgs : IDataEngineeringCommandArgs
     {
-        string Version { get; }
         IEtlArgs Etl { get; }
     }
 }

NBi.Core/Decoration/DataEngineering/ILoadCommandArgs.cs

@@ -1,4 +1,5 @@
 using NBi.Core.Scalar.Resolver;
+using NBi.Core.Decoration.DataEngineering;
 using System;
 using System.Collections.Generic;
 using System.Linq;

NBi.Core/Decoration/DataEngineering/IResetCommandArgs.cs

@@ -1,4 +1,5 @@
 using NBi.Core.Scalar.Resolver;
+using NBi.Core.Decoration.DataEngineering;
 using System;
 using System.Collections.Generic;
 using System.Linq;

NBi.Core/Decoration/DecorationFactory.cs

@@ -7,6 +7,8 @@
 using NBi.Core.Decoration.Process;
 using NBi.Core.Decoration.Grouping;
 using NBi.Core.Assemblies.Decoration;
+using NBi.Extensibility;
+using NBi.Extensibility.Decoration;
 
 namespace NBi.Core.Decoration
 {

NBi.Core/Decoration/Grouping/Commands/ParallelCommand.cs

@@ -1,4 +1,5 @@
-using System;
+using NBi.Extensibility.Decoration;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

NBi.Core/Decoration/Grouping/Commands/SequentialCommand.cs

@@ -1,4 +1,6 @@
-using System;
+using NBi.Extensibility;
+using NBi.Extensibility.Decoration;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

NBi.Core/Decoration/Grouping/IGroupCommandArgs.cs

@@ -1,4 +1,5 @@
-using System;
+using NBi.Extensibility.Decoration;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

NBi.Core/Decoration/IO/Commands/CopyCommand.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using NBi.Core.Decoration.IO;
 using System.Diagnostics;
+using NBi.Extensibility;
 
 namespace NBi.Core.Decoration.IO.Commands
 {

NBi.Core/Decoration/IO/Commands/CopyExtensionCommand.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using NBi.Core.Decoration.IO;
 using System.Diagnostics;
+using NBi.Extensibility;
 
 namespace NBi.Core.Decoration.IO.Commands
 {

NBi.Core/Decoration/IO/Commands/CopyPatternCommand.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using NBi.Core.Decoration.IO;
 using System.Diagnostics;
+using NBi.Extensibility;
 
 namespace NBi.Core.Decoration.IO.Commands
 {

NBi.Core/Decoration/IO/Commands/DeleteExtensionCommand.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using NBi.Core.Decoration.IO;
 using System.Diagnostics;
+using NBi.Extensibility;
 
 namespace NBi.Core.Decoration.IO.Commands
 {

NBi.Core/Decoration/IO/Commands/DeletePatternCommand.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using NBi.Core.Decoration.IO;
 using System.Diagnostics;
+using NBi.Extensibility;
 
 namespace NBi.Core.Decoration.IO.Commands
 {

NBi.Core/Decoration/IO/IIoCommandArgs.cs

@@ -1,4 +1,5 @@
 using NBi.Core.Scalar.Resolver;
+using NBi.Extensibility.Decoration;
 using System;
 using System.Collections.Generic;
 using System.Linq;

NBi.Core/Decoration/Process/Commands/RunCommand.cs

@@ -1,4 +1,5 @@
-using System;
+using NBi.Extensibility;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -52,7 +53,7 @@ public void Execute(string fullPath, string argument, int timeOut)
                 }
                 else
                 {
-                    Trace.WriteLineIf(Extensibility.NBiTraceSwitch.TraceInfo, "Not waiting the end of the process.");
+                    Trace.WriteLineIf(NBiTraceSwitch.TraceInfo, "Not waiting the end of the process.");
                 }
             }
         }

NBi.Core/Decoration/Process/IProcessCommandArgs.cs

@@ -1,4 +1,5 @@
-using System;
+using NBi.Extensibility.Decoration;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;