Removing a few premature abstractions

Since the will start to clash with types in rabbitmq.client 3.4

src/NServiceBus.RabbitMQ.Tests/ClusteringTests/ClusteredTestContext.cs

@@ -250,7 +250,7 @@ static RabbitMqConnectionManager SetupRabbitMqConnectionManager(string connectio
             var config = new ConnectionStringParser(new SettingsHolder()).Parse(connectionString);
             //            config.OverrideClientProperties();
             var selectionStrategy = new DefaultClusterHostSelectionStrategy<ConnectionFactoryInfo>();
-            var connectionFactory = new ConnectionFactoryWrapper(config, selectionStrategy);
+            var connectionFactory = new ClusterAwareConnectionFactory(config, selectionStrategy);
             var newConnectionManager = new RabbitMqConnectionManager(connectionFactory, config);
             return newConnectionManager;
         }

src/NServiceBus.RabbitMQ.Tests/RabbitMqContext.cs

@@ -68,7 +68,7 @@ public void SetUp()
             config.ParseHosts("localhost:5672");
 
             var selectionStrategy = new DefaultClusterHostSelectionStrategy<ConnectionFactoryInfo>();
-            var connectionFactory = new ConnectionFactoryWrapper(config, selectionStrategy);
+            var connectionFactory = new ClusterAwareConnectionFactory(config, selectionStrategy);
             connectionManager = new RabbitMqConnectionManager(connectionFactory, config);
 
             publishChannel = connectionManager.GetPublishConnection().CreateModel();

src/NServiceBus.RabbitMQ/Config/RabbitMqTransportFeature.cs

@@ -147,7 +147,7 @@ protected override void Configure(FeatureConfigurationContext context, string co
             {
                 context.Container.ConfigureComponent<RabbitMqConnectionManager>(DependencyLifecycle.SingleInstance);
 
-                context.Container.ConfigureComponent<IConnectionFactory>(builder => new ConnectionFactoryWrapper(builder.Build<IConnectionConfiguration>(), new DefaultClusterHostSelectionStrategy<ConnectionFactoryInfo>()), DependencyLifecycle.InstancePerCall);
+                context.Container.ConfigureComponent(builder => new ClusterAwareConnectionFactory(builder.Build<IConnectionConfiguration>(), new DefaultClusterHostSelectionStrategy<ConnectionFactoryInfo>()), DependencyLifecycle.InstancePerCall);
             }
         }
 

src/NServiceBus.RabbitMQ/Connection/ConnectionFactoryWrapper.cs → src/NServiceBus.RabbitMQ/Connection/ClusterAwareConnectionFactory.cs

@@ -7,11 +7,11 @@
     using global::RabbitMQ.Client;
     using NServiceBus.Transports.RabbitMQ.Config;
 
-    class ConnectionFactoryWrapper : IConnectionFactory
+    class ClusterAwareConnectionFactory
     {
         public IConnectionConfiguration Configuration { get; private set; }
 
-        public ConnectionFactoryWrapper(IConnectionConfiguration connectionConfiguration, IClusterHostSelectionStrategy<ConnectionFactoryInfo> clusterHostSelectionStrategy)
+        public ClusterAwareConnectionFactory(IConnectionConfiguration connectionConfiguration, IClusterHostSelectionStrategy<ConnectionFactoryInfo> clusterHostSelectionStrategy)
         {
             this.clusterHostSelectionStrategy = clusterHostSelectionStrategy;
             if (connectionConfiguration == null)

src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj

@@ -81,12 +81,11 @@
     <Compile Include="DefaultRoutingKeyConvention.cs" />
     <Compile Include="Config\ConnectionConfiguration.cs" />
     <Compile Include="Connection\ConnectionFactoryInfo.cs" />
-    <Compile Include="Connection\ConnectionFactoryWrapper.cs" />
+    <Compile Include="Connection\ClusterAwareConnectionFactory.cs" />
     <Compile Include="Connection\DefaultClusterHostSelectionStrategy.cs" />
     <Compile Include="Connection\HostConfiguration.cs" />
     <Compile Include="Connection\IClusterHostSelectionStrategy.cs" />
     <Compile Include="Config\IConnectionConfiguration.cs" />
-    <Compile Include="Connection\IConnectionFactory.cs" />
     <Compile Include="Connection\IHostConfiguration.cs" />
     <Compile Include="IChannelProvider.cs" />
     <Compile Include="InternalsVisibleTo.cs" />

src/NServiceBus.RabbitMQ/PersistentConnection.cs

@@ -16,7 +16,7 @@ namespace NServiceBus.Transports.RabbitMQ
     [SkipWeaving]
     class PersistentConnection: IConnection
     {
-        public PersistentConnection(IConnectionFactory connectionFactory, TimeSpan retryDelay,string purpose)
+        public PersistentConnection(ClusterAwareConnectionFactory connectionFactory, TimeSpan retryDelay,string purpose)
         {
             this.connectionFactory = connectionFactory;
             this.retryDelay = retryDelay;
@@ -286,7 +286,7 @@ public void Dispose()
 
         bool disposed;
         IConnection connection;
-        readonly IConnectionFactory connectionFactory;
+        readonly ClusterAwareConnectionFactory connectionFactory;
         readonly TimeSpan retryDelay;
         readonly string purpose;
 

src/NServiceBus.RabbitMQ/RabbitMqConnectionManager.cs

@@ -7,7 +7,7 @@
 
     class RabbitMqConnectionManager : IDisposable, IManageRabbitMqConnections
     {
-        public RabbitMqConnectionManager(IConnectionFactory connectionFactory, IConnectionConfiguration connectionConfiguration)
+        public RabbitMqConnectionManager(ClusterAwareConnectionFactory connectionFactory, IConnectionConfiguration connectionConfiguration)
         {
             this.connectionFactory = connectionFactory;
             this.connectionConfiguration = connectionConfiguration;
@@ -62,7 +62,7 @@ public void DisposeManaged()
             }
         }
 
-        IConnectionFactory connectionFactory;
+        ClusterAwareConnectionFactory connectionFactory;
         IConnectionConfiguration connectionConfiguration;
         PersistentConnection connectionConsume;
         PersistentConnection connectionAdministration;