Merge pull request #556 from Particular/namespace-update

Move settings into NServiceBus namespace
Particular · Feb 5, 2020 · 34c1691 · 34c1691
2 parents 8b36c27 + e6a1b9e
commit 34c1691
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 63 deletions.
diff --git a/src/NServiceBus.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt b/src/NServiceBus.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt
@@ -5,26 +5,6 @@
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
 namespace NServiceBus
 {
-    public class SqlServerTransport : NServiceBus.Transport.TransportDefinition
-    {
-        public SqlServerTransport() { }
-        public override string ExampleConnectionStringForErrorMessage { get; }
-        public override bool RequiresConnectionString { get; }
-        public override NServiceBus.Transport.TransportInfrastructure Initialize(NServiceBus.Settings.SettingsHolder settings, string connectionString) { }
-    }
-}
-namespace NServiceBus.Transport.SqlServer
-{
-    public class DelayedDeliverySettings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
-    {
-        public void BatchSize(int batchSize) { }
-        [System.ObsoleteAttribute("Compatibility with the timeout manager is now disabled by default. The member cur" +
-            "rently throws a NotImplementedException. Will be removed in version 7.0.0.", true)]
-        public void DisableTimeoutManagerCompatibility() { }
-        public void EnableTimeoutManagerCompatibility() { }
-        public void ProcessingInterval(System.TimeSpan interval) { }
-        public void TableSuffix(string suffix) { }
-    }
     public class static MessageDrivenPubSubCompatibilityModeConfiguration
     {
         public static NServiceBus.SubscriptionMigrationModeSettings EnableMessageDrivenPubSubCompatibilityMode(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
@@ -33,6 +13,13 @@ namespace NServiceBus.Transport.SqlServer
     {
         public static void UseCustomSqlTransaction(this NServiceBus.SendOptions options, System.Data.SqlClient.SqlTransaction transaction) { }
     }
+    public class SqlServerTransport : NServiceBus.Transport.TransportDefinition
+    {
+        public SqlServerTransport() { }
+        public override string ExampleConnectionStringForErrorMessage { get; }
+        public override bool RequiresConnectionString { get; }
+        public override NServiceBus.Transport.TransportInfrastructure Initialize(NServiceBus.Settings.SettingsHolder settings, string connectionString) { }
+    }
     public class static SqlServerTransportSettingsExtensions
     {
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> CreateMessageBodyComputedColumn(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
@@ -49,6 +36,19 @@ namespace NServiceBus.Transport.SqlServer
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseSchemaForQueue(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, string queueName, string schema) { }
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> WithPeekDelay(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.Nullable<System.TimeSpan> delay = null) { }
     }
+}
+namespace NServiceBus.Transport.SqlServer
+{
+    public class DelayedDeliverySettings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
+    {
+        public void BatchSize(int batchSize) { }
+        [System.ObsoleteAttribute("Compatibility with the timeout manager is now disabled by default. The member cur" +
+            "rently throws a NotImplementedException. Will be removed in version 7.0.0.", true)]
+        public void DisableTimeoutManagerCompatibility() { }
+        public void EnableTimeoutManagerCompatibility() { }
+        public void ProcessingInterval(System.TimeSpan interval) { }
+        public void TableSuffix(string suffix) { }
+    }
     public class SubscriptionSettings
     {
         public SubscriptionSettings() { }

diff --git a/...ort.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_endpoint.cs b/...ort.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_endpoint.cs
@@ -5,7 +5,6 @@
     using AcceptanceTesting.Customization;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_catalog_configured_for_endpoint : MultiCatalogAcceptanceTest
     {

diff --git a/....SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_error_queue.cs b/....SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_error_queue.cs
@@ -5,7 +5,6 @@
     using AcceptanceTesting;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_catalog_configured_for_error_queue : MultiCatalogAcceptanceTest
     {

diff --git a/...erver.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_legacy_publisher.cs b/...erver.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_legacy_publisher.cs
@@ -6,7 +6,6 @@
     using Configuration.AdvancedExtensibility;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_catalog_configured_for_legacy_publisher : MultiCatalogAcceptanceTest
     {

diff --git a/...ceptanceTests/MultiCatalog/When_custom_catalog_configured_for_publisher_and_subscriber.cs b/...ceptanceTests/MultiCatalog/When_custom_catalog_configured_for_publisher_and_subscriber.cs
@@ -5,7 +5,6 @@
     using Features;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_catalog_configured_for_publisher_and_subscriber : MultiCatalogAcceptanceTest
     {

diff --git a/...sport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint.cs b/...sport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint.cs
@@ -4,7 +4,6 @@
     using AcceptanceTesting;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
-    using SqlServer;
 
     public abstract class When_custom_schema_configured_for_endpoint : NServiceBusAcceptanceTest
     {

diff --git a/...tanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_brackets_syntax.cs b/...tanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_brackets_syntax.cs
@@ -4,7 +4,7 @@
     using AcceptanceTesting;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
+
     using static AcceptanceTesting.Customization.Conventions;
 
     public class When_custom_schema_configured_for_endpoint_with_brackets_syntax : When_custom_schema_configured_for_endpoint

diff --git a/...anceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_default_override.cs b/...anceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_default_override.cs
@@ -5,7 +5,6 @@
     using AcceptanceTesting.Customization;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_schema_configured_for_endpoint_with_default_override : When_custom_schema_configured_for_endpoint
     {

diff --git a/...ts/MultiSchema/When_custom_schema_configured_for_endpoint_with_queue_specific_override.cs b/...ts/MultiSchema/When_custom_schema_configured_for_endpoint_with_queue_specific_override.cs
@@ -4,7 +4,7 @@
     using AcceptanceTesting;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
+
     using static AcceptanceTesting.Customization.Conventions;
 
     public class When_custom_schema_configured_for_endpoint_with_queue_specific_override : When_custom_schema_configured_for_endpoint

diff --git a/...rt.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_error_queue.cs b/...rt.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_error_queue.cs
@@ -6,7 +6,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_schema_configured_for_error_queue : NServiceBusAcceptanceTest
     {

diff --git a/...lServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_legacy_publisher.cs b/...lServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_legacy_publisher.cs
@@ -7,7 +7,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_schema_configured_for_legacy_publisher : NServiceBusAcceptanceTest
     {

diff --git a/...AcceptanceTests/MultiSchema/When_custom_schema_configured_for_publisher_and_subscriber.cs b/...AcceptanceTests/MultiSchema/When_custom_schema_configured_for_publisher_and_subscriber.cs
@@ -6,7 +6,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_schema_configured_for_publisher_and_subscriber : NServiceBusAcceptanceTest
     {

diff --git a/...viceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_contains_at.cs b/...viceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_contains_at.cs
@@ -5,7 +5,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_schema_contains_at : NServiceBusAcceptanceTest
     {

diff --git a/...us.Transport.SqlServer.AcceptanceTests/NativePubSub/When_publisher_runs_in_compat_mode.cs b/...us.Transport.SqlServer.AcceptanceTests/NativePubSub/When_publisher_runs_in_compat_mode.cs
@@ -11,7 +11,6 @@
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
     using Routing.MessageDrivenSubscriptions;
-    using SqlServer;
 
     public class When_publisher_runs_in_compat_mode : NServiceBusAcceptanceTest
     {

diff --git a/...s.Transport.SqlServer.AcceptanceTests/NativePubSub/When_subscriber_runs_in_compat_mode.cs b/...s.Transport.SqlServer.AcceptanceTests/NativePubSub/When_subscriber_runs_in_compat_mode.cs
@@ -9,7 +9,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_subscriber_runs_in_compat_mode : NServiceBusAcceptanceTest
     {

diff --git a/...nceTests/NativeTimeouts/When_deferring_a_message_in_timeout_manager_compatibility_mode.cs b/...nceTests/NativeTimeouts/When_deferring_a_message_in_timeout_manager_compatibility_mode.cs
@@ -8,7 +8,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_deferring_a_message_in_timeout_manager_compatibility_mode : NServiceBusAcceptanceTest
     {

diff --git a/...port.SqlServer.AcceptanceTests/TransactionScope/When_customizing_scope_isolation_level.cs b/...port.SqlServer.AcceptanceTests/TransactionScope/When_customizing_scope_isolation_level.cs
@@ -6,7 +6,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_customizing_scope_isolation_level : NServiceBusAcceptanceTest
     {

diff --git a/...ver.AcceptanceTests/TransactionScope/When_using_scope_timeout_greater_than_machine_max.cs b/...ver.AcceptanceTests/TransactionScope/When_using_scope_timeout_greater_than_machine_max.cs
@@ -5,7 +5,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_using_scope_timeout_greater_than_machine_max : NServiceBusAcceptanceTest
     {

diff --git a/...us.Transport.SqlServer.AcceptanceTests/When_passing_custom_transaction_via_sendoptions.cs b/...us.Transport.SqlServer.AcceptanceTests/When_passing_custom_transaction_via_sendoptions.cs
@@ -11,7 +11,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_passing_custom_transaction_via_sendoptions : NServiceBusAcceptanceTest
     {

diff --git a/...ServiceBus.Transport.SqlServer.AcceptanceTests/When_using_computed_message_body_column.cs b/...ServiceBus.Transport.SqlServer.AcceptanceTests/When_using_computed_message_body_column.cs
@@ -5,7 +5,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_using_computed_message_body_column : NServiceBusAcceptanceTest
     {

diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_custom_connection_factory.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_custom_connection_factory.cs
@@ -12,7 +12,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_using_custom_connection_factory : NServiceBusAcceptanceTest
     {

diff --git a/...NServiceBus.Transport.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt b/...NServiceBus.Transport.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt
@@ -5,26 +5,6 @@
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
 namespace NServiceBus
 {
-    public class SqlServerTransport : NServiceBus.Transport.TransportDefinition
-    {
-        public SqlServerTransport() { }
-        public override string ExampleConnectionStringForErrorMessage { get; }
-        public override bool RequiresConnectionString { get; }
-        public override NServiceBus.Transport.TransportInfrastructure Initialize(NServiceBus.Settings.SettingsHolder settings, string connectionString) { }
-    }
-}
-namespace NServiceBus.Transport.SqlServer
-{
-    public class DelayedDeliverySettings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
-    {
-        public void BatchSize(int batchSize) { }
-        [System.ObsoleteAttribute("Compatibility with the timeout manager is now disabled by default. The member cur" +
-            "rently throws a NotImplementedException. Will be removed in version 7.0.0.", true)]
-        public void DisableTimeoutManagerCompatibility() { }
-        public void EnableTimeoutManagerCompatibility() { }
-        public void ProcessingInterval(System.TimeSpan interval) { }
-        public void TableSuffix(string suffix) { }
-    }
     public class static MessageDrivenPubSubCompatibilityModeConfiguration
     {
         public static NServiceBus.SubscriptionMigrationModeSettings EnableMessageDrivenPubSubCompatibilityMode(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
@@ -33,6 +13,13 @@ namespace NServiceBus.Transport.SqlServer
     {
         public static void UseCustomSqlTransaction(this NServiceBus.SendOptions options, Microsoft.Data.SqlClient.SqlTransaction transaction) { }
     }
+    public class SqlServerTransport : NServiceBus.Transport.TransportDefinition
+    {
+        public SqlServerTransport() { }
+        public override string ExampleConnectionStringForErrorMessage { get; }
+        public override bool RequiresConnectionString { get; }
+        public override NServiceBus.Transport.TransportInfrastructure Initialize(NServiceBus.Settings.SettingsHolder settings, string connectionString) { }
+    }
     public class static SqlServerTransportSettingsExtensions
     {
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> CreateMessageBodyComputedColumn(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
@@ -49,6 +36,19 @@ namespace NServiceBus.Transport.SqlServer
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseSchemaForQueue(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, string queueName, string schema) { }
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> WithPeekDelay(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.Nullable<System.TimeSpan> delay = null) { }
     }
+}
+namespace NServiceBus.Transport.SqlServer
+{
+    public class DelayedDeliverySettings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
+    {
+        public void BatchSize(int batchSize) { }
+        [System.ObsoleteAttribute("Compatibility with the timeout manager is now disabled by default. The member cur" +
+            "rently throws a NotImplementedException. Will be removed in version 7.0.0.", true)]
+        public void DisableTimeoutManagerCompatibility() { }
+        public void EnableTimeoutManagerCompatibility() { }
+        public void ProcessingInterval(System.TimeSpan interval) { }
+        public void TableSuffix(string suffix) { }
+    }
     public class SubscriptionSettings
     {
         public SubscriptionSettings() { }

diff --git a/...erviceBus.Transport.SqlServer/PubSub/MessageDrivenPubSubCompatibilityModeConfiguration.cs b/...erviceBus.Transport.SqlServer/PubSub/MessageDrivenPubSubCompatibilityModeConfiguration.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer
+namespace NServiceBus
 {
     using Configuration.AdvancedExtensibility;
 

diff --git a/src/NServiceBus.Transport.SqlServer/SendOptionsExtensions.cs b/src/NServiceBus.Transport.SqlServer/SendOptionsExtensions.cs
@@ -1,11 +1,13 @@
-namespace NServiceBus.Transport.SqlServer
+namespace NServiceBus
 {
 #if SYSTEMDATASQLCLIENT
     using System.Data.SqlClient;
 #else
     using Microsoft.Data.SqlClient;
 #endif
     using Extensibility;
+    using Transport;
+    using Transport.SqlServer;
 
     /// <summary>
     /// Adds transport specific settings to SendOptions

diff --git a/src/NServiceBus.Transport.SqlServer/SqlServerTransportSettingsExtensions.cs b/src/NServiceBus.Transport.SqlServer/SqlServerTransportSettingsExtensions.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer
+namespace NServiceBus
 {
     using System;
 #if SYSTEMDATASQLCLIENT
@@ -10,6 +10,7 @@
     using System.Transactions;
     using Configuration.AdvancedExtensibility;
     using Logging;
+    using Transport.SqlServer;
 
     /// <summary>
     /// Adds extra configuration for the Sql Server transport.