Allow injection of custom implementation of IPersistentConnection (Ea…

…syNetQ#614) * added the PersistentConnectionFactory * updated version.cs
15below · Sep 26, 2016 · e2b7596 · e2b7596
1 parent fa6557e
commit e2b7596
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 5 deletions.
diff --git a/Source/EasyNetQ.Tests/AdvancedBusEventHandlersTests.cs b/Source/EasyNetQ.Tests/AdvancedBusEventHandlersTests.cs
@@ -48,10 +48,13 @@ public void SetUp()
 
             eventBus = new EventBus();
 
+            var logger = MockRepository.GenerateStub<IEasyNetQLogger>();
+            var persistentConnectionFactory = new PersistentConnectionFactory(logger, connectionFactory, eventBus);            
+
             var advancedBus = new RabbitAdvancedBus(
                 connectionFactory,
                 MockRepository.GenerateStub<IConsumerFactory>(),
-                MockRepository.GenerateStub<IEasyNetQLogger>(),
+                logger,
                 MockRepository.GenerateStub<IClientCommandDispatcherFactory>(),
                 MockRepository.GenerateStub<IPublishConfirmationListener>(),
                 eventBus,
@@ -61,7 +64,8 @@ public void SetUp()
                 MockRepository.GenerateStub<IProduceConsumeInterceptor>(),
                 MockRepository.GenerateStub<IMessageSerializationStrategy>(),
                 MockRepository.GenerateStub<IConventions>(),
-                advancedBusEventHandlers);
+                advancedBusEventHandlers,
+                persistentConnectionFactory);
         }
 
         [Test]

diff --git a/Source/EasyNetQ/ComponentRegistration.cs b/Source/EasyNetQ/ComponentRegistration.cs
@@ -40,6 +40,7 @@ public static void RegisterServices(IContainer container)
                 .Register<IConsumerFactory, ConsumerFactory>()
                 .Register<IConnectionFactory, ConnectionFactoryWrapper>()
                 .Register<IPersistentChannelFactory, PersistentChannelFactory>()
+                .Register<IPersistentConnectionFactory, PersistentConnectionFactory>()
                 .Register<IClientCommandDispatcherFactory, ClientCommandDispatcherFactory>()
                 .Register<IPublishConfirmationListener, PublishConfirmationListener>()
                 .Register<IHandlerCollectionFactory, HandlerCollectionFactory>()

diff --git a/Source/EasyNetQ/EasyNetQ.projitems b/Source/EasyNetQ/EasyNetQ.projitems
@@ -92,6 +92,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Interception\IProduceConsumeInterceptor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interception\RawMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interception\TripleDESInterceptor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IPersistentConnectionFactory.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ISerializer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IServiceProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ISubscriptionResult.cs" />
@@ -118,6 +119,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)NonGeneric\NonGenericExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)OrderedClusterHostSelectionStrategy.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)PersistentConnection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PersistentConnectionFactory.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Preconditions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Producer\ClientCommandDispatcher.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Producer\ClientCommandDispatcherSingleton.cs" />

diff --git a/Source/EasyNetQ/IPersistentConnectionFactory.cs b/Source/EasyNetQ/IPersistentConnectionFactory.cs
@@ -0,0 +1,7 @@
+namespace EasyNetQ
+{
+    public interface IPersistentConnectionFactory
+    {
+        IPersistentConnection CreateConnection();
+    }
+}
diff --git a/Source/EasyNetQ/PersistentConnectionFactory.cs b/Source/EasyNetQ/PersistentConnectionFactory.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace EasyNetQ
+{
+    public class PersistentConnectionFactory : IPersistentConnectionFactory
+    {
+        private readonly IEventBus eventBus;
+        private readonly IConnectionFactory connectionFactory;
+        private readonly IEasyNetQLogger logger;
+
+        public PersistentConnectionFactory(IEasyNetQLogger logger, IConnectionFactory connectionFactory, IEventBus eventBus)
+        {
+            this.logger = logger;
+            this.connectionFactory = connectionFactory;
+            this.eventBus = eventBus;
+        }
+
+        public IPersistentConnection CreateConnection()
+        {
+            return new PersistentConnection(connectionFactory, logger, eventBus);
+        }
+    }
+}
diff --git a/Source/EasyNetQ/RabbitAdvancedBus.cs b/Source/EasyNetQ/RabbitAdvancedBus.cs
@@ -40,7 +40,8 @@ public RabbitAdvancedBus(
             IProduceConsumeInterceptor produceConsumeInterceptor,
             IMessageSerializationStrategy messageSerializationStrategy,
             IConventions conventions,
-            AdvancedBusEventHandlers advancedBusEventHandlers)
+            AdvancedBusEventHandlers advancedBusEventHandlers,
+            IPersistentConnectionFactory persistentConnectionFactory)
         {
             Preconditions.CheckNotNull(connectionFactory, "connectionFactory");
             Preconditions.CheckNotNull(consumerFactory, "consumerFactory");
@@ -53,6 +54,7 @@ public RabbitAdvancedBus(
             Preconditions.CheckNotNull(produceConsumeInterceptor, "produceConsumeInterceptor");
             Preconditions.CheckNotNull(conventions, "conventions");
             Preconditions.CheckNotNull(advancedBusEventHandlers, "advancedBusEventHandlers");
+            Preconditions.CheckNotNull(persistentConnectionFactory, "persistentConnectionFactory");
 
             this.consumerFactory = consumerFactory;
             this.logger = logger;
@@ -91,7 +93,7 @@ public RabbitAdvancedBus(
                 MessageReturned += advancedBusEventHandlers.MessageReturned;
             }
 
-            connection = new PersistentConnection(connectionFactory, logger, eventBus);
+            connection = persistentConnectionFactory.CreateConnection();
             clientCommandDispatcher = clientCommandDispatcherFactory.GetClientCommandDispatcher(connection);
             connection.Initialize();
         }

diff --git a/Source/Version.cs b/Source/Version.cs
@@ -3,10 +3,11 @@
 
 // EasyNetQ version number: <major>.<minor>.<non-breaking-feature>.<build>
 // Note: until version 1.0 expect breaking changes on 0.X versions.
-[assembly: AssemblyVersion("0.63.1.0")]
+[assembly: AssemblyVersion("0.63.3.0")]
 [assembly: CLSCompliant(false)]
 
 // Note: until version 1.0 expect breaking changes on 0.X versions.
+// 0.63.3.0 Allow injection of custom implementation of IPersistentConnection
 // 0.63.2.0 Make SimpleInjectorMessageDispatcher public so it can be used with AutoSubscriber
 // 0.63.1.0 Set upper bound of supported rabbitmq client version
 // 0.63.0.0 Make ConnectIntervalAttempt for PersistentConnection configurable on ConnectionConfiguration