From 6b9421983cee3395678866acac2440fae54c31b3 Mon Sep 17 00:00:00 2001 From: Dan Kent Date: Thu, 1 Aug 2024 09:08:14 -0400 Subject: [PATCH 1/6] Bump minimum NSB version to 9.1 --- src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj b/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj index 3c4bba29..788670f5 100644 --- a/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj +++ b/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj @@ -11,7 +11,7 @@ - + From ebb218e19e5922d77e5a44f1cbe8c50ef22c5cee Mon Sep 17 00:00:00 2001 From: Dan Kent Date: Thu, 1 Aug 2024 11:17:27 -0400 Subject: [PATCH 2/6] Update library references --- ...ServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj | 1 + src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj | 2 +- src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj index 36cb9cd2..10e4b767 100644 --- a/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj +++ b/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj @@ -13,6 +13,7 @@ + diff --git a/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj b/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj index 788670f5..3c702462 100644 --- a/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj +++ b/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj b/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj index 12c8f1e8..50c7c6ad 100644 --- a/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj +++ b/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj @@ -13,8 +13,8 @@ - - + + From c972f12cb268884106167bad1765fe4960d6aafd Mon Sep 17 00:00:00 2001 From: Dan Kent Date: Thu, 1 Aug 2024 11:17:47 -0400 Subject: [PATCH 3/6] Add usings and namespace changes --- src/AcceptanceTests/ConfigureDatabusEndpoint.cs | 3 +++ src/AcceptanceTests/When_using_databus_with_client.cs | 6 ++++-- .../When_using_databus_with_connection_string.cs | 11 +++++------ .../When_using_databus_with_custom_provider.cs | 1 + src/AcceptanceTests/When_using_databus_with_expiry.cs | 11 +++++------ src/DataBus/AzureDataBus.cs | 2 +- src/DataBus/AzureDataBusPersistence.cs | 3 ++- src/DataBus/BlobStorageDataBus.cs | 1 + src/DataBus/ConfigureAzureDataBus.cs | 2 +- src/Tests/When_using_AzureDataBusGuard.cs | 2 +- 10 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/AcceptanceTests/ConfigureDatabusEndpoint.cs b/src/AcceptanceTests/ConfigureDatabusEndpoint.cs index 3e54a5ad..174b9dde 100644 --- 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/When_using_databus_with_client.cs b/src/AcceptanceTests/When_using_databus_with_client.cs index 013e96a5..cb5a4b82 100644 --- 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(b => b.When(session => session.SendLocal(new MyMessageWithLargePayload { - Payload = new DataBusProperty(payloadToSend) + Payload = new ClaimCheck.DataBus.DataBusProperty(payloadToSend) }))) .Done(c => c.MessageReceived) .Run(); @@ -64,7 +66,7 @@ public Task Handle(MyMessageWithLargePayload message, IMessageHandlerContext con public class MyMessageWithLargePayload : ICommand { - public DataBusProperty Payload { get; set; } + public ClaimCheck.DataBus.DataBusProperty 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 index 66a75af4..a683abed 100644 --- 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() .WithEndpoint(b => b.When(session => - session.SendLocal(new MyMessageWithLargePayload - { - Payload = new DataBusProperty(payloadToSend) - }))) + session.SendLocal(new MyMessageWithLargePayload { Payload = new ClaimCheck.DataBus.DataBusProperty(payloadToSend) }))) .Done(c => c.MessageReceived) .Run(); @@ -64,7 +63,7 @@ public Task Handle(MyMessageWithLargePayload message, IMessageHandlerContext con public class MyMessageWithLargePayload : ICommand { - public DataBusProperty Payload { get; set; } + public ClaimCheck.DataBus.DataBusProperty Payload { get; set; } } } -} +} \ No newline at end of file diff --git a/src/AcceptanceTests/When_using_databus_with_custom_provider.cs b/src/AcceptanceTests/When_using_databus_with_custom_provider.cs index 8391596c..19ca6249 100644 --- 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 index 2589b396..e208794c 100644 --- 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() .WithEndpoint(b => b.When(session => - session.SendLocal(new MyMessageWithLargePayloadAndExpiry - { - Payload = new DataBusProperty(payloadToSend) - }))) + session.SendLocal(new MyMessageWithLargePayloadAndExpiry { Payload = new ClaimCheck.DataBus.DataBusProperty(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 Payload { get; set; } + public ClaimCheck.DataBus.DataBusProperty Payload { get; set; } } } -} +} \ No newline at end of file diff --git a/src/DataBus/AzureDataBus.cs b/src/DataBus/AzureDataBus.cs index 7f1279c4..40733a60 100644 --- a/src/DataBus/AzureDataBus.cs +++ b/src/DataBus/AzureDataBus.cs @@ -1,7 +1,7 @@ namespace NServiceBus { using System; - using DataBus; + using NServiceBus.ClaimCheck.DataBus; /// /// DataBus implementation that uses azure blob storage. diff --git a/src/DataBus/AzureDataBusPersistence.cs b/src/DataBus/AzureDataBusPersistence.cs index aff7f49d..ba0d122c 100644 --- 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(); + DependsOn(); } protected override void Setup(FeatureConfigurationContext context) diff --git a/src/DataBus/BlobStorageDataBus.cs b/src/DataBus/BlobStorageDataBus.cs index 537a6e4f..8e24e1a1 100644 --- 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 index 0d35456d..e40f43b7 100644 --- 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/Tests/When_using_AzureDataBusGuard.cs b/src/Tests/When_using_AzureDataBusGuard.cs index 6976a512..fc0498c7 100644 --- 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; From 356982fe8b9fbb20b8aaf106503cf23e0a78ba94 Mon Sep 17 00:00:00 2001 From: Dan Kent Date: Thu, 1 Aug 2024 11:17:56 -0400 Subject: [PATCH 4/6] Update approval file --- .../APIApprovals.Approve.approved.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Tests/ApprovalFiles/APIApprovals.Approve.approved.txt b/src/Tests/ApprovalFiles/APIApprovals.Approve.approved.txt index a361df6d..34e08e75 100644 --- 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 BackOffInterval(this NServiceBus.DataBus.DataBusExtensions config, int backOffInterval) { } - public static NServiceBus.DataBus.DataBusExtensions BasePath(this NServiceBus.DataBus.DataBusExtensions config, string basePath) { } - public static NServiceBus.DataBus.DataBusExtensions ConnectionString(this NServiceBus.DataBus.DataBusExtensions config, string connectionString) { } - public static NServiceBus.DataBus.DataBusExtensions Container(this NServiceBus.DataBus.DataBusExtensions config, string containerName) { } - public static NServiceBus.DataBus.DataBusExtensions MaxRetries(this NServiceBus.DataBus.DataBusExtensions config, int maxRetries) { } - public static NServiceBus.DataBus.DataBusExtensions NumberOfIOThreads(this NServiceBus.DataBus.DataBusExtensions config, int numberOfIOThreads) { } - public static NServiceBus.DataBus.DataBusExtensions UseBlobServiceClient(this NServiceBus.DataBus.DataBusExtensions config, Azure.Storage.Blobs.BlobServiceClient blobServiceClient) { } + public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions BackOffInterval(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions config, int backOffInterval) { } + public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions BasePath(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions config, string basePath) { } + public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions ConnectionString(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions config, string connectionString) { } + public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions Container(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions config, string containerName) { } + public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions MaxRetries(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions config, int maxRetries) { } + public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions NumberOfIOThreads(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions config, int numberOfIOThreads) { } + public static NServiceBus.ClaimCheck.DataBus.DataBusExtensions UseBlobServiceClient(this NServiceBus.ClaimCheck.DataBus.DataBusExtensions config, Azure.Storage.Blobs.BlobServiceClient blobServiceClient) { } } } namespace NServiceBus.DataBus.AzureBlobStorage From 328f65defb8462eee37ac0780220c173d1d5a93c Mon Sep 17 00:00:00 2001 From: Dan Kent Date: Mon, 5 Aug 2024 14:27:17 -0400 Subject: [PATCH 5/6] Update ClaimCheck to 1.0.1-alpha.1 --- .../NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj | 2 +- src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj | 2 +- src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj index 10e4b767..3df5bc55 100644 --- a/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj +++ b/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj b/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj index 3c702462..cd5e836d 100644 --- a/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj +++ b/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj b/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj index 50c7c6ad..c8cdb83a 100644 --- a/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj +++ b/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj @@ -14,7 +14,7 @@ - + From 0d3d5ee3d21d44dfc8189ae935aa3e4d3bce24ae Mon Sep 17 00:00:00 2001 From: Dan Kent Date: Tue, 6 Aug 2024 15:50:36 -0400 Subject: [PATCH 6/6] Bump to latest ClaimCheck.DataBus --- .../NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj | 2 +- src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj | 2 +- src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj b/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj index 3df5bc55..a27fb5d7 100644 --- a/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj +++ b/src/AcceptanceTests/NServiceBus.DataBus.AzureBlobStorage.AcceptanceTests.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj b/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj index cd5e836d..3c702462 100644 --- a/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj +++ b/src/DataBus/NServiceBus.DataBus.AzureBlobStorage.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj b/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj index c8cdb83a..5d42f8a8 100644 --- a/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj +++ b/src/Tests/NServiceBus.DataBus.AzureBlobStorage.Tests.csproj @@ -14,7 +14,7 @@ - +