Replacing new ProxyGenerator() with a static instance

Elad Zelingher · Elad Zelingher · commit 8067a58e15ef · 2016-10-22T14:29:14.000+03:00
diff --git a/src/mono/WampSharp/WampSharp.csproj b/src/mono/WampSharp/WampSharp.csproj
@@ -248,6 +248,9 @@
     <Compile Include="..\..\net45\WampSharp\Core\Utilities\AsyncDisposable\AsyncDisposableExtensions.cs">
       <Link>Core\Utilities\AsyncDisposable\AsyncDisposableExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\..\net45\WampSharp\Core\Utilities\CastleDynamicProxyGenerator.cs">
+      <Link>Core\Utilities\CastleDynamicProxyGenerator.cs</Link>
+    </Compile>
     <Compile Include="..\..\net45\WampSharp\Core\Utilities\CustomAttributeExtensions.cs">
       <Link>Core\Utilities\CustomAttributeExtensions.cs</Link>
     </Compile>
diff --git a/src/net40/WampSharp/WampSharp.csproj b/src/net40/WampSharp/WampSharp.csproj
@@ -251,6 +251,9 @@
     <Compile Include="..\..\net45\WampSharp\Core\Utilities\AsyncDisposable\AsyncDisposableExtensions.cs">
       <Link>Core\Utilities\AsyncDisposable\AsyncDisposableExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\..\net45\WampSharp\Core\Utilities\CastleDynamicProxyGenerator.cs">
+      <Link>Core\Utilities\CastleDynamicProxyGenerator.cs</Link>
+    </Compile>
     <Compile Include="..\..\net45\WampSharp\Core\Utilities\CustomAttributeExtensions.cs">
       <Link>Core\Utilities\CustomAttributeExtensions.cs</Link>
     </Compile>
diff --git a/src/net45/WampSharp.WAMP1/WAMP1/V1/Core/Listener/ClientBuilder/WampClientBuilder.cs b/src/net45/WampSharp.WAMP1/WAMP1/V1/Core/Listener/ClientBuilder/WampClientBuilder.cs
@@ -2,6 +2,7 @@
 using WampSharp.Core.Listener;
 using WampSharp.Core.Message;
 using WampSharp.Core.Proxy;
+using WampSharp.Core.Utilities;
 using WampSharp.V1.Core.Contracts;
 using WampSharp.V1.Core.Curie;
 using WampSharp.V1.Core.Proxy;
@@ -18,7 +19,7 @@ public class WampClientBuilder<TMessage> : IWampClientBuilder<TMessage, IWampCli
         #region Members
 
         private readonly IWampClientContainer<TMessage, IWampClient> mContainer;
-        private readonly ProxyGenerator mGenerator = new ProxyGenerator();
+        private readonly ProxyGenerator mGenerator = CastleDynamicProxyGenerator.Instance;
         private readonly IWampOutgoingRequestSerializer mOutgoingSerializer;
         private readonly IWampOutgoingMessageHandlerBuilder<TMessage> mOutgoingHandlerBuilder;
 
diff --git a/src/net45/WampSharp.WAMP1/WAMP1/V1/Rpc/Client/WampRpcClientFactory.cs b/src/net45/WampSharp.WAMP1/WAMP1/V1/Rpc/Client/WampRpcClientFactory.cs
@@ -1,5 +1,6 @@
 ﻿using Castle.DynamicProxy;
 using WampSharp.Core.Listener;
+using WampSharp.Core.Utilities;
 
 namespace WampSharp.V1.Rpc.Client
 {
@@ -10,7 +11,7 @@ namespace WampSharp.V1.Rpc.Client
     /// <typeparam name="TMessage"></typeparam>
     public class WampRpcClientFactory<TMessage> : IWampRpcClientFactory<TMessage>
     {
-        private readonly ProxyGenerator mProxyGenerator = new ProxyGenerator();
+        private readonly ProxyGenerator mProxyGenerator = CastleDynamicProxyGenerator.Instance;
         private readonly IWampRpcSerializer mSerializer;
         private readonly IWampRpcClientHandlerBuilder<TMessage> mClientHandlerBuilder;
 
diff --git a/src/net45/WampSharp/Core/Client/WampServerProxyBuilder.cs b/src/net45/WampSharp/Core/Client/WampServerProxyBuilder.cs
@@ -3,6 +3,7 @@
 using WampSharp.Core.Listener;
 using WampSharp.Core.Message;
 using WampSharp.Core.Proxy;
+using WampSharp.Core.Utilities;
 
 namespace WampSharp.Core.Client
 {
@@ -16,7 +17,7 @@ public class WampServerProxyBuilder<TMessage, TRawClient, TServer> : IWampServer
         where TServer : class
     {
         private readonly IWampServerProxyOutgoingMessageHandlerBuilder<TMessage, TRawClient> mOutgoingHandlerBuilder;
-        private readonly ProxyGenerator mProxyGenerator = new ProxyGenerator();
+        private readonly ProxyGenerator mProxyGenerator = CastleDynamicProxyGenerator.Instance;
         private readonly IWampOutgoingRequestSerializer mOutgoingSerializer;
 
         /// <summary>
diff --git a/src/net45/WampSharp/Core/Serialization/WampMessageSerializerFactory.cs b/src/net45/WampSharp/Core/Serialization/WampMessageSerializerFactory.cs
@@ -1,6 +1,7 @@
 ﻿#if CASTLE
 using Castle.DynamicProxy;
 using WampSharp.Core.Proxy;
+using WampSharp.Core.Utilities;
 
 namespace WampSharp.Core.Serialization
 {
@@ -11,7 +12,7 @@ namespace WampSharp.Core.Serialization
     /// <typeparam name="TMessage"></typeparam>
     public class WampMessageSerializerFactory<TMessage> : IWampMessageSerializerFactory
     {
-        private readonly ProxyGenerator mGenerator = new ProxyGenerator();
+        private readonly ProxyGenerator mGenerator = CastleDynamicProxyGenerator.Instance;
         private readonly WampSerializationInterceptor<TMessage> mSerializationInterceptor;
 
         /// <summary>
diff --git a/src/net45/WampSharp/Core/Utilities/CastleDynamicProxyGenerator.cs b/src/net45/WampSharp/Core/Utilities/CastleDynamicProxyGenerator.cs
@@ -0,0 +1,33 @@
+﻿#if CASTLE
+
+using System;
+using System.Threading;
+using Castle.DynamicProxy;
+
+namespace WampSharp.Core.Utilities
+{
+    internal static class CastleDynamicProxyGenerator
+    {
+        private static string PREFIX = typeof(CastleDynamicProxyGenerator).Assembly.GetName().Name + ".";
+
+        public static readonly ProxyGenerator Instance = GetProxyGenerator();
+
+        private static ProxyGenerator GetProxyGenerator()
+        {
+            ModuleScope moduleScope = GetModuleScope();
+            return new ProxyGenerator(new DefaultProxyBuilder(moduleScope));
+        }
+
+        private static ModuleScope GetModuleScope()
+        {
+            return new ModuleScope(savePhysicalAssembly: false,
+                                   disableSignedModule: false,
+                                   strongAssemblyName: PREFIX + ModuleScope.DEFAULT_ASSEMBLY_NAME,
+                                   strongModulePath: PREFIX + ModuleScope.DEFAULT_FILE_NAME,
+                                   weakAssemblyName: PREFIX + ModuleScope.DEFAULT_ASSEMBLY_NAME,
+                                   weakModulePath: PREFIX + ModuleScope.DEFAULT_FILE_NAME);
+        }
+    }
+}
+
+#endif
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/CalleeProxy/WampCalleeProxyFactory.cs b/src/net45/WampSharp/WAMP2/V2/Api/CalleeProxy/WampCalleeProxyFactory.cs
@@ -2,12 +2,13 @@
 using System.Linq;
 using System.Reflection;
 using Castle.DynamicProxy;
+using WampSharp.Core.Utilities;
 
 namespace WampSharp.V2.CalleeProxy
 {
     internal class WampCalleeProxyFactory : IWampCalleeProxyFactory
     {
-        private readonly ProxyGenerator mGenerator = new ProxyGenerator();
+        private readonly ProxyGenerator mGenerator = CastleDynamicProxyGenerator.Instance;
         private readonly WampCalleeProxyInvocationHandler mHandler;
 
         public WampCalleeProxyFactory(WampCalleeProxyInvocationHandler handler)
diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Listener/ClientBuilder/WampClientBuilder.cs b/src/net45/WampSharp/WAMP2/V2/Core/Listener/ClientBuilder/WampClientBuilder.cs
@@ -3,6 +3,7 @@
 using WampSharp.Core.Listener;
 using WampSharp.Core.Message;
 using WampSharp.Core.Proxy;
+using WampSharp.Core.Utilities;
 using WampSharp.V2.Authentication;
 using WampSharp.V2.Binding;
 using WampSharp.V2.Core.Contracts;
@@ -21,7 +22,7 @@ public class WampClientBuilder<TMessage> : IWampClientBuilder<TMessage, IWampCli
         #region Members
 
         private readonly IWampClientContainer<TMessage, IWampClientProxy<TMessage>> mContainer;
-        private readonly ProxyGenerator mGenerator = new ProxyGenerator();
+        private readonly ProxyGenerator mGenerator = CastleDynamicProxyGenerator.Instance;
         private readonly IWampOutgoingRequestSerializer mOutgoingSerializer;
         private readonly IWampOutgoingMessageHandlerBuilder<TMessage> mOutgoingHandlerBuilder;
         private readonly IWampIdGenerator mSessionIdGenerator;
diff --git a/src/net45/WampSharp/WampSharp.csproj b/src/net45/WampSharp/WampSharp.csproj
@@ -133,6 +133,7 @@
     <Compile Include="Core\Serialization\WampMessageSerializerFactory.cs" />
     <Compile Include="Core\Serialization\WampSerializationInterceptor.cs" />
     <Compile Include="Core\Utilities\AsyncDisposable\AsyncDisposableExtensions.cs" />
+    <Compile Include="Core\Utilities\CastleDynamicProxyGenerator.cs" />
     <Compile Include="Core\Utilities\CustomAttributeExtensions.cs" />
     <Compile Include="Core\Utilities\DictionaryExtensions.cs" />
     <Compile Include="Core\Utilities\GenericTypeExtensions.cs" />
diff --git a/src/pcl/WampSharp/WampSharp.csproj b/src/pcl/WampSharp/WampSharp.csproj
@@ -250,6 +250,9 @@
     <Compile Include="..\..\net45\WampSharp\Core\Utilities\AsyncDisposable\AsyncDisposableExtensions.cs">
       <Link>Core\Utilities\AsyncDisposable\AsyncDisposableExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\..\net45\WampSharp\Core\Utilities\CastleDynamicProxyGenerator.cs">
+      <Link>Core\Utilities\CastleDynamicProxyGenerator.cs</Link>
+    </Compile>
     <Compile Include="..\..\net45\WampSharp\Core\Utilities\CustomAttributeExtensions.cs">
       <Link>Core\Utilities\CustomAttributeExtensions.cs</Link>
     </Compile>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Castle.DynamicProxy;`
`2`	`2`	`using WampSharp.Core.Listener;`
	`3`	`+using WampSharp.Core.Utilities;`
`3`	`4`
`4`	`5`	`namespace WampSharp.V1.Rpc.Client`
`5`	`6`	`{`
`@@ -10,7 +11,7 @@ namespace WampSharp.V1.Rpc.Client`
`10`	`11`	`/// <typeparam name="TMessage"></typeparam>`
`11`	`12`	`public class WampRpcClientFactory<TMessage> : IWampRpcClientFactory<TMessage>`
`12`	`13`	`{`
`13`		`- private readonly ProxyGenerator mProxyGenerator = new ProxyGenerator();`
	`14`	`+ private readonly ProxyGenerator mProxyGenerator = CastleDynamicProxyGenerator.Instance;`
`14`	`15`	`private readonly IWampRpcSerializer mSerializer;`
`15`	`16`	`private readonly IWampRpcClientHandlerBuilder<TMessage> mClientHandlerBuilder;`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using WampSharp.Core.Listener;`
`4`	`4`	`using WampSharp.Core.Message;`
`5`	`5`	`using WampSharp.Core.Proxy;`
	`6`	`+using WampSharp.Core.Utilities;`
`6`	`7`
`7`	`8`	`namespace WampSharp.Core.Client`
`8`	`9`	`{`
`@@ -16,7 +17,7 @@ public class WampServerProxyBuilder<TMessage, TRawClient, TServer> : IWampServer`
`16`	`17`	`where TServer : class`
`17`	`18`	`{`
`18`	`19`	`private readonly IWampServerProxyOutgoingMessageHandlerBuilder<TMessage, TRawClient> mOutgoingHandlerBuilder;`
`19`		`- private readonly ProxyGenerator mProxyGenerator = new ProxyGenerator();`
	`20`	`+ private readonly ProxyGenerator mProxyGenerator = CastleDynamicProxyGenerator.Instance;`
`20`	`21`	`private readonly IWampOutgoingRequestSerializer mOutgoingSerializer;`
`21`	`22`
`22`	`23`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#if CASTLE`
`2`	`2`	`using Castle.DynamicProxy;`
`3`	`3`	`using WampSharp.Core.Proxy;`
	`4`	`+using WampSharp.Core.Utilities;`
`4`	`5`
`5`	`6`	`namespace WampSharp.Core.Serialization`
`6`	`7`	`{`
`@@ -11,7 +12,7 @@ namespace WampSharp.Core.Serialization`
`11`	`12`	`/// <typeparam name="TMessage"></typeparam>`
`12`	`13`	`public class WampMessageSerializerFactory<TMessage> : IWampMessageSerializerFactory`
`13`	`14`	`{`
`14`		`- private readonly ProxyGenerator mGenerator = new ProxyGenerator();`
	`15`	`+ private readonly ProxyGenerator mGenerator = CastleDynamicProxyGenerator.Instance;`
`15`	`16`	`private readonly WampSerializationInterceptor<TMessage> mSerializationInterceptor;`
`16`	`17`
`17`	`18`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,13 @@`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Reflection;`
`4`	`4`	`using Castle.DynamicProxy;`
	`5`	`+using WampSharp.Core.Utilities;`
`5`	`6`
`6`	`7`	`namespace WampSharp.V2.CalleeProxy`
`7`	`8`	`{`
`8`	`9`	`internal class WampCalleeProxyFactory : IWampCalleeProxyFactory`
`9`	`10`	`{`
`10`		`- private readonly ProxyGenerator mGenerator = new ProxyGenerator();`
	`11`	`+ private readonly ProxyGenerator mGenerator = CastleDynamicProxyGenerator.Instance;`
`11`	`12`	`private readonly WampCalleeProxyInvocationHandler mHandler;`
`12`	`13`
`13`	`14`	`public WampCalleeProxyFactory(WampCalleeProxyInvocationHandler handler)`