Merge pull request #654 from Particular/use-new-databus-lib

Use NServiceBus.ClaimCheck.DataBus library
Particular · Aug 7, 2024 · a5c4d56 · a5c4d56
2 parents 70325a8 + 0d3d5ee
commit a5c4d56
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 29 deletions.
diff --git a/src/AcceptanceTests/ConfigureDatabusEndpoint.cs b/src/AcceptanceTests/ConfigureDatabusEndpoint.cs
@@ -1,8 +1,11 @@
 using System.Threading.Tasks;
 using NServiceBus;
 using NServiceBus.AcceptanceTesting.Support;
+using NServiceBus.ClaimCheck.DataBus;
 using NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests;
 
+using SystemJsonDataBusSerializer = NServiceBus.ClaimCheck.DataBus.SystemJsonDataBusSerializer;
+
 public class ConfigureDatabusEndpoint : IConfigureEndpointTestExecution
 {
     public Task Configure(string endpointName, EndpointConfiguration configuration, RunSettings settings, PublisherMetadata publisherMetadata)

diff --git a/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj
@@ -13,6 +13,7 @@
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.1.0" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.ClaimCheck.DataBus" Version="1.0.1" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>

diff --git a/src/AcceptanceTests/When_using_databus_with_client.cs b/src/AcceptanceTests/When_using_databus_with_client.cs
@@ -6,7 +6,9 @@
     using NServiceBus;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
+    using NServiceBus.ClaimCheck.DataBus;
     using NUnit.Framework;
+    using SystemJsonDataBusSerializer = NServiceBus.ClaimCheck.DataBus.SystemJsonDataBusSerializer;
 
     public class When_using_databus_with_client : NServiceBusAcceptanceTest
     {
@@ -20,7 +22,7 @@ public async Task Should_work()
                 .WithEndpoint<EndpointWithCustomClient>(b => b.When(session =>
                     session.SendLocal(new MyMessageWithLargePayload
                     {
-                        Payload = new DataBusProperty<byte[]>(payloadToSend)
+                        Payload = new ClaimCheck.DataBus.DataBusProperty<byte[]>(payloadToSend)
                     })))
                 .Done(c => c.MessageReceived)
                 .Run();
@@ -64,7 +66,7 @@ public Task Handle(MyMessageWithLargePayload message, IMessageHandlerContext con
 
         public class MyMessageWithLargePayload : ICommand
         {
-            public DataBusProperty<byte[]> Payload { get; set; }
+            public ClaimCheck.DataBus.DataBusProperty<byte[]> Payload { get; set; }
         }
     }
 }
diff --git a/src/AcceptanceTests/When_using_databus_with_connection_string.cs b/src/AcceptanceTests/When_using_databus_with_connection_string.cs
@@ -6,7 +6,9 @@
     using NServiceBus;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
+    using NServiceBus.ClaimCheck.DataBus;
     using NUnit.Framework;
+    using SystemJsonDataBusSerializer = NServiceBus.ClaimCheck.DataBus.SystemJsonDataBusSerializer;
 
     public class When_using_databus_with_connection_string : NServiceBusAcceptanceTest
     {
@@ -18,10 +20,7 @@ public async Task Should_work()
 
             var context = await Scenario.Define<Context>()
                 .WithEndpoint<EndpointWithDatabusUsingConnection>(b => b.When(session =>
-                    session.SendLocal(new MyMessageWithLargePayload
-                    {
-                        Payload = new DataBusProperty<byte[]>(payloadToSend)
-                    })))
+                    session.SendLocal(new MyMessageWithLargePayload { Payload = new ClaimCheck.DataBus.DataBusProperty<byte[]>(payloadToSend) })))
                 .Done(c => c.MessageReceived)
                 .Run();
 
@@ -64,7 +63,7 @@ public Task Handle(MyMessageWithLargePayload message, IMessageHandlerContext con
 
         public class MyMessageWithLargePayload : ICommand
         {
-            public DataBusProperty<byte[]> Payload { get; set; }
+            public ClaimCheck.DataBus.DataBusProperty<byte[]> Payload { get; set; }
         }
     }
-}
+}
diff --git a/src/AcceptanceTests/When_using_databus_with_custom_provider.cs b/src/AcceptanceTests/When_using_databus_with_custom_provider.cs
@@ -8,6 +8,7 @@
     using Microsoft.Extensions.DependencyInjection;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
+    using NServiceBus.ClaimCheck.DataBus;
 
     public class When_using_databus_with_custom_provider : NServiceBusAcceptanceTest
     {

diff --git a/src/AcceptanceTests/When_using_databus_with_expiry.cs b/src/AcceptanceTests/When_using_databus_with_expiry.cs
@@ -6,7 +6,9 @@
     using NServiceBus;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
+    using NServiceBus.ClaimCheck.DataBus;
     using NUnit.Framework;
+    using SystemJsonDataBusSerializer = NServiceBus.ClaimCheck.DataBus.SystemJsonDataBusSerializer;
 
     public class When_using_databus_with_expiry : NServiceBusAcceptanceTest
     {
@@ -18,10 +20,7 @@ public async Task Should_work()
 
             var context = await Scenario.Define<Context>()
                 .WithEndpoint<EndpointReceivingMessageWithExpiry>(b => b.When(session =>
-                    session.SendLocal(new MyMessageWithLargePayloadAndExpiry
-                    {
-                        Payload = new DataBusProperty<byte[]>(payloadToSend)
-                    })))
+                    session.SendLocal(new MyMessageWithLargePayloadAndExpiry { Payload = new ClaimCheck.DataBus.DataBusProperty<byte[]>(payloadToSend) })))
                 .Done(c => c.MessageReceived)
                 .Run();
 
@@ -66,7 +65,7 @@ public Task Handle(MyMessageWithLargePayloadAndExpiry message, IMessageHandlerCo
         [TimeToBeReceived("00:00:30")]
         public class MyMessageWithLargePayloadAndExpiry : ICommand
         {
-            public DataBusProperty<byte[]> Payload { get; set; }
+            public ClaimCheck.DataBus.DataBusProperty<byte[]> Payload { get; set; }
         }
     }
-}
+}
diff --git a/src/DataBus/AzureDataBus.cs b/src/DataBus/AzureDataBus.cs
@@ -1,7 +1,7 @@
 namespace NServiceBus
 {
     using System;
-    using DataBus;
+    using NServiceBus.ClaimCheck.DataBus;
 
     /// <summary>
     /// DataBus implementation that uses azure blob storage.

diff --git a/src/DataBus/AzureDataBusPersistence.cs b/src/DataBus/AzureDataBusPersistence.cs
@@ -5,13 +5,14 @@ namespace NServiceBus.DataBus.AzureBlobStorage
     using Azure.Storage.Blobs;
     using Microsoft.Extensions.DependencyInjection;
     using Features;
+    using ClaimCheck.DataBus;
     using Config;
 
     class AzureDataBusPersistence : Feature
     {
         public AzureDataBusPersistence()
         {
-            DependsOn<DataBus>();
+            DependsOn<DataBusFeature>();
         }
 
         protected override void Setup(FeatureConfigurationContext context)

diff --git a/src/DataBus/BlobStorageDataBus.cs b/src/DataBus/BlobStorageDataBus.cs
@@ -8,6 +8,7 @@ namespace NServiceBus.DataBus.AzureBlobStorage
     using Azure.Storage;
     using Azure.Storage.Blobs;
     using Azure.Storage.Blobs.Models;
+    using ClaimCheck.DataBus;
     using Logging;
     using Microsoft.IO;
 

diff --git a/src/DataBus/ConfigureAzureDataBus.cs b/src/DataBus/ConfigureAzureDataBus.cs
@@ -4,7 +4,7 @@
     using System.Text.RegularExpressions;
     using Azure.Storage.Blobs;
     using Configuration.AdvancedExtensibility;
-    using DataBus;
+    using ClaimCheck.DataBus;
     using DataBus.AzureBlobStorage;
     using DataBus.AzureBlobStorage.Config;
 

diff --git a/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj b/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="[12.19.1, 13.0.0)" />
     <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
-    <PackageReference Include="NServiceBus" Version="[9.0.0, 10.0.0)" />
+    <PackageReference Include="NServiceBus.ClaimCheck.DataBus" Version="[1.0.0, 2.0.0)" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="All" />
     <PackageReference Include="Particular.Packaging" Version="4.1.0" PrivateAssets="All" />
   </ItemGroup>

diff --git a/src/Tests/ApprovalFiles/APIApprovals.Approve.approved.txt b/src/Tests/ApprovalFiles/APIApprovals.Approve.approved.txt
@@ -2,20 +2,20 @@
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
 namespace NServiceBus
 {
-    public class AzureDataBus : NServiceBus.DataBus.DataBusDefinition
+    public class AzureDataBus : NServiceBus.ClaimCheck.DataBus.DataBusDefinition
     {
         public AzureDataBus() { }
         protected override System.Type ProvidedByFeature() { }
     }
     public static class ConfigureAzureDataBus
     {
-        public static NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> BackOffInterval(this NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, int backOffInterval) { }
-        public static NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> BasePath(this NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, string basePath) { }
-        public static NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> ConnectionString(this NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, string connectionString) { }
-        public static NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> Container(this NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, string containerName) { }
-        public static NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> MaxRetries(this NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, int maxRetries) { }
-        public static NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> NumberOfIOThreads(this NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, int numberOfIOThreads) { }
-        public static NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> UseBlobServiceClient(this NServiceBus.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, Azure.Storage.Blobs.BlobServiceClient blobServiceClient) { }
+        public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> BackOffInterval(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, int backOffInterval) { }
+        public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> BasePath(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, string basePath) { }
+        public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> ConnectionString(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, string connectionString) { }
+        public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> Container(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, string containerName) { }
+        public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> MaxRetries(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, int maxRetries) { }
+        public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> NumberOfIOThreads(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, int numberOfIOThreads) { }
+        public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> UseBlobServiceClient(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions<NServiceBus.AzureDataBus> config, Azure.Storage.Blobs.BlobServiceClient blobServiceClient) { }
     }
 }
 namespace NServiceBus.DataBus.AzureBlobStorage

diff --git a/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj b/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj
@@ -13,8 +13,8 @@
   <ItemGroup>
     <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="NServiceBus" Version="9.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />    
+    <PackageReference Include="NServiceBus.ClaimCheck.DataBus" Version="1.0.1" />    
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="Particular.Approvals" Version="1.0.0" />

diff --git a/src/Tests/When_using_AzureDataBusGuard.cs b/src/Tests/When_using_AzureDataBusGuard.cs
@@ -1,7 +1,7 @@
 namespace NServiceBus.Azure.Tests.DataBus
 {
     using System;
-    using NServiceBus.DataBus;
+    using NServiceBus.ClaimCheck.DataBus;
     using NUnit.Framework;
     using Settings;