1. Removed unncessary components.

2. Refactoring
rohan3usturge · Jul 3, 2017 · 362f3d9 · 362f3d9
1 parent e9caec3
commit 362f3d9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 33 deletions.
diff --git a/ProxyMapper.sln b/ProxyMapper.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.26430.6
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProxyMapper", "ProxyMapper\ProxyMapper.csproj", "{4551806A-2756-4F17-B78B-E835B7CF5CC1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{35FCAB98-D5FF-4CEF-B718-F796CE675E9A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,4 +21,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{4551806A-2756-4F17-B78B-E835B7CF5CC1} = {35FCAB98-D5FF-4CEF-B718-F796CE675E9A}
+	EndGlobalSection
 EndGlobal
diff --git a/ProxyMapper/Core/DbCallInterceptor.cs b/ProxyMapper/Core/DbCallInterceptor.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Data;
 using System.Data.SqlClient;
-using System.Diagnostics;
 using System.Reflection;
 using Castle.Core.Internal;
 using Castle.DynamicProxy;
@@ -20,7 +18,6 @@ internal class DbCallInterceptor : IInterceptor
 
         private readonly IValidatorChain<CallInfo> _validatorChain;
 
-
         public DbCallInterceptor(string connectionString, IDataProcessor dataProcessor)
         {
             this._connectionString = connectionString;
@@ -34,8 +31,6 @@ public DbCallInterceptor(string connectionString, IDataProcessor dataProcessor)
         public void Intercept(IInvocation invocation)
         {
             SqlConnection conn = null;
-            Stopwatch stopwatch = new Stopwatch();
-            stopwatch.Start();
             try
             {
                 MethodInfo methodInfo = invocation.Method;
@@ -94,16 +89,9 @@ public void Intercept(IInvocation invocation)
                     }
                 }
             }
-            catch (Exception ex)
-            {
-                //this._logger.LogError($"Db Call Processing Failed for - {callInfo}");
-                throw new Exception(ex.Message, ex);
-            }
             finally
             {
                 conn?.Close();
-                stopwatch.Stop();
-                //this._logger.LogInformation($"Db Call Processing completed in {stopwatch.ElapsedMilliseconds} ms for - {callInfo}");
             }
         }
 

diff --git a/ProxyMapper/Core/ProxyFactory.cs b/ProxyMapper/Core/ProxyFactory.cs
@@ -1,21 +1,22 @@
-using Castle.DynamicProxy;
-using Microsoft.Extensions.Logging;
+using System;
+using System.Reflection;
+using Castle.DynamicProxy;
 
 namespace ProxyMapper.Core
 {
-    public class ProxyFactory
+    public static class ProxyFactory
     {
-        private readonly ILogger _logger;
+        private static readonly ProxyGenerator ProxyGenerator = new ProxyGenerator();
 
-        public ProxyFactory(ILogger logger)
+        public static T CreateRepoProxy<T>(string connectionString, IDataProcessor dataProcessor = null) where T : class
         {
-            this._logger = logger;
-        }
-
-        public T CreateProxy<T>(string connectionString, IDataProcessor dataProcessor = null) where T : class
-        {
-            ProxyGenerator proxyGenerator = new ProxyGenerator();
-            object proxy = proxyGenerator.CreateInterfaceProxyWithoutTarget(typeof(T), new DbCallInterceptor(connectionString, GetDataProcessor(dataProcessor)));
+            if (!typeof(T).GetTypeInfo().IsInterface)
+            {
+                throw new InvalidOperationException(
+                    "Proxies can be generated only for interfaces. Please provide a proper interface.");
+            }
+            object proxy = ProxyGenerator.CreateInterfaceProxyWithoutTarget(typeof(T),
+                new DbCallInterceptor(connectionString, GetDataProcessor(dataProcessor)));
             return (T) proxy;
         }
 

diff --git a/ProxyMapper/Enums/CallType.cs b/ProxyMapper/Enums/CallType.cs
@@ -3,10 +3,6 @@
     public enum CallType
     {
         Procedure,
-        Function,
-        Select,
-        Delete,
-        Update,
-        Insert
+        Text
     }
 }
diff --git a/ProxyMapper/ProxyMapper.csproj b/ProxyMapper/ProxyMapper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46;netcoreapp1.1</TargetFrameworks>
     <PackageId>ProxyMapper</PackageId>
     <PackageVersion>0.1.1</PackageVersion>
     <Authors>Rohan Usturge</Authors>
@@ -14,9 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="4.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
-    <PackageReference Include="protobuf-net" Version="2.2.1" />
     <PackageReference Include="System.Data.SqlClient" Version="4.3.1" />
   </ItemGroup>