Moved EnableFileBasedRouting to routing config. (#18)

Author: SzymonPobiega

src/EndpointA/Program.cs

@@ -24,8 +24,7 @@ static async Task AsyncMain()
             var routingConfig = endpointConfiguration.UseTransport<MsmqTransport>().Routing();
             routingConfig.RegisterPublisher(typeof(DemoCommandReceived), "endpointB");
             routingConfig.InstanceMappingFile().FilePath("instance-mapping.xml");
-
-            endpointConfiguration.EnableFileBasedRouting();
+            routingConfig.UseFileBasedRouting();
 
             var endpoint = await Endpoint.Start(endpointConfiguration);
 

src/EndpointB/Configuration.cs

@@ -18,8 +18,7 @@ public static async Task Start(string discriminator)
 
             var routingConfig = endpointConfiguration.UseTransport<MsmqTransport>().Routing();
             routingConfig.RegisterPublisher(typeof(DemoEvent), "endpointA");
-
-            endpointConfiguration.EnableFileBasedRouting();
+            routingConfig.UseFileBasedRouting();
 
             var endpoint = await Endpoint.Start(endpointConfiguration);
 

src/NServiceBus.FileBasedRouting.Tests/EndpointBasedIntegrationTests.cs

@@ -67,15 +67,15 @@ static async Task<Func<Type,UnicastRoute>> GetRouting(string filePath)
             var endpointConfiguration = new EndpointConfiguration("test");
             endpointConfiguration.UsePersistence<InMemoryPersistence>();
             endpointConfiguration.SendFailedMessagesTo("error");
-            endpointConfiguration.UseTransport<MsmqTransport>();
+            var routing = endpointConfiguration.UseTransport<MsmqTransport>().Routing();
 
             if (filePath == null)
             {
-                endpointConfiguration.EnableFileBasedRouting();
+                routing.UseFileBasedRouting();
             }
             else
             {
-                endpointConfiguration.EnableFileBasedRouting(filePath);
+                routing.UseFileBasedRouting(filePath);
             }
 
             await Endpoint.Create(endpointConfiguration); // to init all features

src/NServiceBus.FileBasedRouting/FileBasedRoutingConfigExtensions.cs

@@ -2,26 +2,28 @@
 
 namespace NServiceBus.FileBasedRouting
 {
+    using Features;
+
     public static class FileBasedRoutingConfigExtensions
     {
         /// <summary>
         /// Enables routing configured with the routing configuration file.
         /// </summary>
         /// <param name="config">The configuration object.</param>
-        public static void EnableFileBasedRouting(this EndpointConfiguration config)
+        public static void UseFileBasedRouting(this RoutingSettings config)
         {
-            config.EnableFeature<FileBasedRoutingFeature>();
+            config.GetSettings().EnableFeatureByDefault<FileBasedRoutingFeature>();
         }
 
         /// <summary>
         /// Enables routing configured with the routing configuration file under <paramref name="configurationFilePath"/>
         /// </summary>
         /// <param name="config">The configuration object.</param>
         /// <param name="configurationFilePath">The path to the configuration file.</param>
-        public static void EnableFileBasedRouting(this EndpointConfiguration config, string configurationFilePath)
+        public static void UseFileBasedRouting(this RoutingSettings config, string configurationFilePath)
         {
             config.GetSettings().Set(FileBasedRoutingFeature.RoutingFilePathKey, configurationFilePath);
-            config.EnableFeature<FileBasedRoutingFeature>();
+            config.GetSettings().EnableFeatureByDefault<FileBasedRoutingFeature>();
         }
     }
 }