Update #283 - More refactoring changes

Glimpse · Mar 7, 2013 · 3921822 · 3921822
1 parent 16cd84e
commit 3921822
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 37 deletions.
diff --git a/source/Glimpse.Ado/Glimpse.Ado.csproj b/source/Glimpse.Ado/Glimpse.Ado.csproj
@@ -41,6 +41,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Extensibility\ICommandParameterParser.cs" />
+    <Compile Include="Inspector\AdoInspector.cs" />
+    <Compile Include="Inspector\Support\WrapDbProviderFactories.cs" />
     <Compile Include="Message\AdoCommandMessage.cs" />
     <Compile Include="Message\AdoMessage.cs" />
     <Compile Include="Message\AdoTransactionMessage.cs" />

diff --git a/source/Glimpse.Ado/Inspector/AdoInspector.cs b/source/Glimpse.Ado/Inspector/AdoInspector.cs
@@ -0,0 +1,14 @@
+using Glimpse.Ado.Inspector.Support;
+using Glimpse.Core.Extensibility; 
+
+namespace Glimpse.Ado.Inspector
+{
+    public class AdoInspector : IInspector
+    {
+        public void Setup(IInspectorContext context)
+        {            
+            var wrapDbProviderFactories = new WrapDbProviderFactories(context);
+            wrapDbProviderFactories.Inject();              
+        }
+    }
+}
diff --git a/...bing/Injectors/WrapDbProviderFactories.cs → ...pector/Support/WrapDbProviderFactories.cs b/...bing/Injectors/WrapDbProviderFactories.cs → ...pector/Support/WrapDbProviderFactories.cs
@@ -7,7 +7,7 @@
 using Glimpse.Ado.AlternateType;
 using Glimpse.Core.Extensibility;
 
-namespace Glimpse.EF.Plumbing.Injectors
+namespace Glimpse.Ado.Inspector.Support
 {
     public class WrapDbProviderFactories
     {

diff --git a/...iler/GlimpseProfileDbConnectionFactory.cs → ...eType/Asset/GlimpseDbConnectionFactory.cs b/...iler/GlimpseProfileDbConnectionFactory.cs → ...eType/Asset/GlimpseDbConnectionFactory.cs
@@ -5,9 +5,9 @@
 using System.Reflection;
 using Glimpse.Ado.AlternateType;
 
-namespace Glimpse.EF.Plumbing.Profiler
+namespace Glimpse.EF.AlternateType.Asset
 {
-    internal class GlimpseProfileDbConnectionFactory : IDbConnectionFactory
+    internal class GlimpseDbConnectionFactory : IDbConnectionFactory
     { 
         private readonly IDbConnectionFactory inner;
         private readonly DbProviderFactory factory;

diff --git a/source/Glimpse.EF/Glimpse.EF.csproj b/source/Glimpse.EF/Glimpse.EF.csproj
@@ -40,11 +40,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Plumbing\Profiler\GlimpseProfileDbConnectionFactory.cs" />
-    <Compile Include="Service\EF.cs" />
-    <Compile Include="Plumbing\Injectors\WrapCachedMetadata.cs" />
-    <Compile Include="Plumbing\Injectors\WrapDbConnectionFactories.cs" />
-    <Compile Include="Plumbing\Injectors\WrapDbProviderFactories.cs" />
+    <EmbeddedResource Include="AlternateType\Asset\GlimpseDbConnectionFactory.cs" />
+    <Compile Include="Inspector\EntityFrameworkInspector.cs" />
+    <Compile Include="Inspector\Support\WrapCachedMetadata.cs" />
+    <Compile Include="Inspector\Support\WrapDbConnectionFactories.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/source/Glimpse.EF/Inspector/EntityFrameworkInspector.cs b/source/Glimpse.EF/Inspector/EntityFrameworkInspector.cs
@@ -0,0 +1,17 @@
+using Glimpse.Core.Extensibility;
+using Glimpse.EF.Inspector.Support;
+
+namespace Glimpse.EF.Inspector
+{
+    public class EntityFrameworkInspector : IInspector
+    {
+        public void Setup(IInspectorContext context)
+        {             
+            var wrapDbConnectionFactories = new WrapDbConnectionFactories();
+            wrapDbConnectionFactories.Inject();
+
+            var wrapCachedMetadata = new WrapCachedMetadata();
+            wrapCachedMetadata.Inject();              
+        }
+    }
+}
diff --git a/.../Plumbing/Injectors/WrapCachedMetadata.cs → ...F/Inspector/Support/WrapCachedMetadata.cs b/.../Plumbing/Injectors/WrapCachedMetadata.cs → ...F/Inspector/Support/WrapCachedMetadata.cs
@@ -5,7 +5,7 @@
 using Glimpse.Ado.AlternateType;
 using Glimpse.Core.Extensibility;
 
-namespace Glimpse.EF.Plumbing.Injectors
+namespace Glimpse.EF.Inspector.Support
 {
     public class WrapCachedMetadata
     {       

diff --git a/...ng/Injectors/WrapDbConnectionFactories.cs → ...ctor/Support/WrapDbConnectionFactories.cs b/...ng/Injectors/WrapDbConnectionFactories.cs → ...ctor/Support/WrapDbConnectionFactories.cs
@@ -9,7 +9,7 @@
 using Glimpse.Core.Extensibility;
 using Microsoft.CSharp;
 
-namespace Glimpse.EF.Plumbing.Injectors
+namespace Glimpse.EF.Inspector.Support
 {
     public class WrapDbConnectionFactories
     {
@@ -28,11 +28,11 @@ public void Inject()
             {
            //     Logger.Info("AdoPipelineInitiator for EF: Starting to inject ConnectionFactory");
 
-                var code = GetEmbeddedResource(GetType().Assembly, "Glimpse.EF.Plumbing.AlternateType.GlimpseDbConnectionFactory.cs");
+                var code = GetEmbeddedResource(GetType().Assembly, "Glimpse.EF.AlternateType.Asset.GlimpseDbConnectionFactory.cs");
                 var assembliesToReference = new[] { type.Assembly, typeof(DbConnection).Assembly, typeof(TypeConverter).Assembly, typeof(IInspectorContext).Assembly };
 
                 var generatedAssembly = CreateAssembly(code, assembliesToReference);
-                var generatedType = generatedAssembly.GetType("Glimpse.EF.AlternateType.GlimpseDbConnectionFactory");
+                var generatedType = generatedAssembly.GetType("Glimpse.EF.AlternateType.Asset.GlimpseDbConnectionFactory");
                 generatedType.GetMethod("Initialize").Invoke(null, null);
 
                 //Logger.Info("AdoPipelineInitiator for EF: Finished to inject ConnectionFactory");

diff --git a/source/Glimpse.EF/Service/EF.cs b/source/Glimpse.EF/Service/EF.cs