Skip to content

Commit 2758285

Browse files
danielmarbachdependencyupdates[bot]andreasohlund
authored
Alternative: Update NServiceBus Core to 10.0.0-alpha.8 (#109)
* Update NServiceBus Core to 10.0.0-alpha.8 * Preserve definition * Abstract members cannot be properly obsoleted * Seal public type since it should not be inherited * Inheritdoc * Small cleanup * Await using * Test cleanup * Simplify syntax * Get rid of the definition from the settings * Cleanup ctor and methods * Simplify code further * Using * Restore last one wins semantics * Strong typed configuration * Allow better strong typing * Refactor to not use features for individual implementations * Obsolete public feature * Using * Fix message * Approve api --------- Co-authored-by: dependencyupdates[bot] <218638057+dependencyupdates[bot]@users.noreply.github.com> Co-authored-by: Daniel Marbach <danielmarbach@users.noreply.github.com> Co-authored-by: Andreas Öhlund <andreas.ohlund@particular.net>
1 parent 34e4ea7 commit 2758285

32 files changed

Lines changed: 180 additions & 424 deletions

‎src/NServiceBus.ClaimCheck.AcceptanceTests/NServiceBus.ClaimCheck.AcceptanceTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="10.0.0-alpha.7" />
21+
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="10.0.0-alpha.8" />
2222
</ItemGroup>
2323

2424
</Project>

‎src/NServiceBus.ClaimCheck.AcceptanceTests/When_sender_serializer_differ.cs‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ public class Context : ScenarioContext
3838

3939
public class Sender : EndpointConfigurationBuilder
4040
{
41-
public Sender()
42-
{
41+
public Sender() =>
4342
EndpointSetup<DefaultServer>(builder =>
4443
{
4544
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
@@ -48,13 +47,11 @@ public Sender()
4847

4948
builder.ConfigureRouting().RouteToEndpoint(typeof(MyMessageWithLargePayload), typeof(Receiver));
5049
});
51-
}
5250
}
5351

5452
public class Receiver : EndpointConfigurationBuilder
5553
{
56-
public Receiver()
57-
{
54+
public Receiver() =>
5855
EndpointSetup<DefaultServer>(builder =>
5956
{
6057
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
@@ -65,23 +62,15 @@ public Receiver()
6562

6663
builder.RegisterMessageMutator(new Mutator());
6764
});
68-
}
6965

70-
public class MyMessageHandler : IHandleMessages<MyMessageWithLargePayload>
66+
public class MyMessageHandler(Context testContext) : IHandleMessages<MyMessageWithLargePayload>
7167
{
72-
public MyMessageHandler(Context context)
73-
{
74-
testContext = context;
75-
}
76-
7768
public Task Handle(MyMessageWithLargePayload messageWithLargePayload, IMessageHandlerContext context)
7869
{
7970
testContext.ReceivedPayload = messageWithLargePayload.Payload.Value;
8071

8172
return Task.CompletedTask;
8273
}
83-
84-
Context testContext;
8574
}
8675

8776
public class Mutator : IMutateIncomingTransportMessages
@@ -99,16 +88,11 @@ public Task MutateIncoming(MutateIncomingTransportMessageContext context)
9988

10089
class MyCustomSerializer : IClaimCheckSerializer
10190
{
102-
public void Serialize(object databusProperty, Stream stream)
103-
{
91+
public void Serialize(object databusProperty, Stream stream) =>
10492
new System.Xml.Serialization.XmlSerializer(databusProperty.GetType())
10593
.Serialize(stream, databusProperty);
106-
}
10794

108-
public object Deserialize(Type propertyType, Stream stream)
109-
{
110-
return new System.Xml.Serialization.XmlSerializer(propertyType).Deserialize(stream);
111-
}
95+
public object Deserialize(Type propertyType, Stream stream) => new System.Xml.Serialization.XmlSerializer(propertyType).Deserialize(stream);
11296

11397
public string ContentType => "xml";
11498
}

‎src/NServiceBus.ClaimCheck.AcceptanceTests/When_sending_databus_properties_from_different_environments.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ public class Context : ScenarioContext
5656

5757
public class WindowsSender : EndpointConfigurationBuilder
5858
{
59-
public WindowsSender()
60-
{
59+
public WindowsSender() =>
6160
EndpointSetup<DefaultServer>(builder =>
6261
{
6362
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
@@ -66,7 +65,6 @@ public WindowsSender()
6665
builder.ConfigureRouting().RouteToEndpoint(typeof(MyMessageWithLargePayload), typeof(Receiver));
6766
builder.RegisterMessageMutator(new MutateOutgoingForWindows());
6867
});
69-
}
7068

7169
public class MutateOutgoingForWindows : IMutateOutgoingTransportMessages
7270
{
@@ -82,8 +80,7 @@ public Task MutateOutgoing(MutateOutgoingTransportMessageContext context)
8280

8381
public class LinuxSender : EndpointConfigurationBuilder
8482
{
85-
public LinuxSender()
86-
{
83+
public LinuxSender() =>
8784
EndpointSetup<DefaultServer>(builder =>
8885
{
8986
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
@@ -92,7 +89,6 @@ public LinuxSender()
9289
builder.ConfigureRouting().RouteToEndpoint(typeof(MyMessageWithLargePayload), typeof(Receiver));
9390
builder.RegisterMessageMutator(new MutateOutgoingForLinux());
9491
});
95-
}
9692

9793
public class MutateOutgoingForLinux : IMutateOutgoingTransportMessages
9894
{

‎src/NServiceBus.ClaimCheck.AcceptanceTests/When_sending_databus_properties_with_systemjson_message_serializer.cs‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,46 +38,35 @@ public class Context : ScenarioContext
3838

3939
public class Sender : EndpointConfigurationBuilder
4040
{
41-
public Sender()
42-
{
41+
public Sender() =>
4342
EndpointSetup<DefaultServer>(builder =>
4443
{
4544
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
4645
builder.UseClaimCheck<FileShareClaimCheck, SystemJsonClaimCheckSerializer>().BasePath(basePath);
4746
builder.UseSerialization<SystemJsonSerializer>();
4847
builder.ConfigureRouting().RouteToEndpoint(typeof(MyMessageWithLargePayload), typeof(Receiver));
4948
});
50-
}
5149
}
5250

5351
public class Receiver : EndpointConfigurationBuilder
5452
{
55-
public Receiver()
56-
{
53+
public Receiver() =>
5754
EndpointSetup<DefaultServer>(builder =>
5855
{
5956
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
6057
builder.UseClaimCheck<FileShareClaimCheck, SystemJsonClaimCheckSerializer>().BasePath(basePath);
6158
builder.UseSerialization<SystemJsonSerializer>();
6259
builder.RegisterMessageMutator(new Mutator());
6360
});
64-
}
6561

66-
public class MyMessageHandler : IHandleMessages<MyMessageWithLargePayload>
62+
public class MyMessageHandler(Context testContext) : IHandleMessages<MyMessageWithLargePayload>
6763
{
68-
public MyMessageHandler(Context context)
69-
{
70-
testContext = context;
71-
}
72-
7364
public Task Handle(MyMessageWithLargePayload messageWithLargePayload, IMessageHandlerContext context)
7465
{
7566
testContext.ReceivedPayload = messageWithLargePayload.Payload.Value;
7667

7768
return Task.CompletedTask;
7869
}
79-
80-
Context testContext;
8170
}
8271

8372
public class Mutator : IMutateIncomingTransportMessages

‎src/NServiceBus.ClaimCheck.AcceptanceTests/When_sending_databus_properties_with_xml_message_serializer.cs‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,46 +38,35 @@ public class Context : ScenarioContext
3838

3939
public class Sender : EndpointConfigurationBuilder
4040
{
41-
public Sender()
42-
{
41+
public Sender() =>
4342
EndpointSetup<DefaultServer>(builder =>
4443
{
4544
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
4645
builder.UseClaimCheck<FileShareClaimCheck, SystemJsonClaimCheckSerializer>().BasePath(basePath);
4746
builder.UseSerialization<XmlSerializer>();
4847
builder.ConfigureRouting().RouteToEndpoint(typeof(MyMessageWithLargePayload), typeof(Receiver));
4948
});
50-
}
5149
}
5250

5351
public class Receiver : EndpointConfigurationBuilder
5452
{
55-
public Receiver()
56-
{
53+
public Receiver() =>
5754
EndpointSetup<DefaultServer>(builder =>
5855
{
5956
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
6057
builder.UseClaimCheck<FileShareClaimCheck, SystemJsonClaimCheckSerializer>().BasePath(basePath);
6158
builder.UseSerialization<XmlSerializer>();
6259
builder.RegisterMessageMutator(new Mutator());
6360
});
64-
}
6561

66-
public class MyMessageHandler : IHandleMessages<MyMessageWithLargePayload>
62+
public class MyMessageHandler(Context testContext) : IHandleMessages<MyMessageWithLargePayload>
6763
{
68-
public MyMessageHandler(Context context)
69-
{
70-
testContext = context;
71-
}
72-
7364
public Task Handle(MyMessageWithLargePayload messageWithLargePayload, IMessageHandlerContext context)
7465
{
7566
testContext.ReceivedPayload = messageWithLargePayload.Payload.Value;
7667

7768
return Task.CompletedTask;
7869
}
79-
80-
Context testContext;
8170
}
8271

8372
public class Mutator : IMutateIncomingTransportMessages

‎src/NServiceBus.ClaimCheck.AcceptanceTests/When_sending_unobtrusive_databus_properties_with_systemjson_message_serializer.cs‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,52 +38,41 @@ public class Context : ScenarioContext
3838

3939
public class Sender : EndpointConfigurationBuilder
4040
{
41-
public Sender()
42-
{
41+
public Sender() =>
4342
EndpointSetup<DefaultServer>(builder =>
4443
{
45-
ConventionsBuilderExtensions.DefiningClaimCheckPropertiesAs(builder.Conventions()
46-
.DefiningCommandsAs(t => t.Namespace != null && t.FullName == typeof(MyMessageWithLargePayload).FullName), t => t.Name.Contains("Payload"));
44+
builder.Conventions()
45+
.DefiningCommandsAs(t => t.Namespace != null && t.FullName == typeof(MyMessageWithLargePayload).FullName).DefiningClaimCheckPropertiesAs(t => t.Name.Contains("Payload"));
4746

4847
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
4948
builder.UseClaimCheck<FileShareClaimCheck, SystemJsonClaimCheckSerializer>().BasePath(basePath);
5049
builder.UseSerialization<SystemJsonSerializer>();
5150
builder.ConfigureRouting().RouteToEndpoint(typeof(MyMessageWithLargePayload), typeof(Receiver));
5251
}).ExcludeType<MyMessageWithLargePayload>(); // remove that type from assembly scanning to simulate what would happen with true unobtrusive mode
53-
}
5452
}
5553

5654
public class Receiver : EndpointConfigurationBuilder
5755
{
58-
public Receiver()
59-
{
56+
public Receiver() =>
6057
EndpointSetup<DefaultServer>(builder =>
6158
{
62-
ConventionsBuilderExtensions.DefiningClaimCheckPropertiesAs(builder.Conventions()
63-
.DefiningCommandsAs(t => t.Namespace != null && t.FullName == typeof(MyMessageWithLargePayload).FullName), t => t.Name.Contains("Payload"));
59+
builder.Conventions()
60+
.DefiningCommandsAs(t => t.Namespace != null && t.FullName == typeof(MyMessageWithLargePayload).FullName).DefiningClaimCheckPropertiesAs(t => t.Name.Contains("Payload"));
6461

6562
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
6663
builder.UseClaimCheck<FileShareClaimCheck, SystemJsonClaimCheckSerializer>().BasePath(basePath);
6764
builder.UseSerialization<SystemJsonSerializer>();
6865
builder.RegisterMessageMutator(new Mutator());
6966
});
70-
}
7167

72-
public class MyMessageHandler : IHandleMessages<MyMessageWithLargePayload>
68+
public class MyMessageHandler(Context testContext) : IHandleMessages<MyMessageWithLargePayload>
7369
{
74-
public MyMessageHandler(Context context)
75-
{
76-
testContext = context;
77-
}
78-
7970
public Task Handle(MyMessageWithLargePayload messageWithLargePayload, IMessageHandlerContext context)
8071
{
8172
testContext.ReceivedPayload = messageWithLargePayload.Payload;
8273

8374
return Task.CompletedTask;
8475
}
85-
86-
Context testContext;
8776
}
8877

8978
public class Mutator : IMutateIncomingTransportMessages

‎src/NServiceBus.ClaimCheck.AcceptanceTests/When_sending_unobtrusive_databus_properties_with_xml_message_serializer.cs‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,52 +38,41 @@ public class Context : ScenarioContext
3838

3939
public class Sender : EndpointConfigurationBuilder
4040
{
41-
public Sender()
42-
{
41+
public Sender() =>
4342
EndpointSetup<DefaultServer>(builder =>
4443
{
45-
ConventionsBuilderExtensions.DefiningClaimCheckPropertiesAs(builder.Conventions()
46-
.DefiningCommandsAs(t => t.Namespace != null && t.FullName == typeof(MyMessageWithLargePayload).FullName), t => t.Name.Contains("Payload"));
44+
builder.Conventions()
45+
.DefiningCommandsAs(t => t.Namespace != null && t.FullName == typeof(MyMessageWithLargePayload).FullName).DefiningClaimCheckPropertiesAs(t => t.Name.Contains("Payload"));
4746

4847
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
4948
builder.UseClaimCheck<FileShareClaimCheck, SystemJsonClaimCheckSerializer>().BasePath(basePath);
5049
builder.UseSerialization<XmlSerializer>();
5150
builder.ConfigureRouting().RouteToEndpoint(typeof(MyMessageWithLargePayload), typeof(Receiver));
5251
}).ExcludeType<MyMessageWithLargePayload>(); // remove that type from assembly scanning to simulate what would happen with true unobtrusive mode
53-
}
5452
}
5553

5654
public class Receiver : EndpointConfigurationBuilder
5755
{
58-
public Receiver()
59-
{
56+
public Receiver() =>
6057
EndpointSetup<DefaultServer>(builder =>
6158
{
62-
ConventionsBuilderExtensions.DefiningClaimCheckPropertiesAs(builder.Conventions()
63-
.DefiningCommandsAs(t => t.Namespace != null && t.FullName == typeof(MyMessageWithLargePayload).FullName), t => t.Name.Contains("Payload"));
59+
builder.Conventions()
60+
.DefiningCommandsAs(t => t.Namespace != null && t.FullName == typeof(MyMessageWithLargePayload).FullName).DefiningClaimCheckPropertiesAs(t => t.Name.Contains("Payload"));
6461

6562
var basePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "databus", "sender");
6663
builder.UseClaimCheck<FileShareClaimCheck, SystemJsonClaimCheckSerializer>().BasePath(basePath);
6764
builder.UseSerialization<XmlSerializer>();
6865
builder.RegisterMessageMutator(new Mutator());
6966
});
70-
}
7167

72-
public class MyMessageHandler : IHandleMessages<MyMessageWithLargePayload>
68+
public class MyMessageHandler(Context testContext) : IHandleMessages<MyMessageWithLargePayload>
7369
{
74-
public MyMessageHandler(Context context)
75-
{
76-
testContext = context;
77-
}
78-
7970
public Task Handle(MyMessageWithLargePayload messageWithLargePayload, IMessageHandlerContext context)
8071
{
8172
testContext.ReceivedPayload = messageWithLargePayload.Payload;
8273

8374
return Task.CompletedTask;
8475
}
85-
86-
Context testContext;
8776
}
8877

8978
public class Mutator : IMutateIncomingTransportMessages

‎src/NServiceBus.ClaimCheck.AcceptanceTests/When_using_custom_IDataBus.cs‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,49 +38,31 @@ public class Context : ScenarioContext
3838

3939
public class SenderViaFluent : EndpointConfigurationBuilder
4040
{
41-
public SenderViaFluent()
42-
{
41+
public SenderViaFluent() =>
4342
EndpointSetup<DefaultServer>(b =>
4443
{
4544
b.UseClaimCheck(sp => new MyDataBus(sp.GetRequiredService<Context>()), new SystemJsonClaimCheckSerializer());
4645
b.ConfigureRouting().RouteToEndpoint(typeof(MyMessageWithLargePayload), typeof(ReceiverViaFluent));
4746
});
48-
}
4947
}
5048

5149
public class ReceiverViaFluent : EndpointConfigurationBuilder
5250
{
53-
public ReceiverViaFluent()
54-
{
55-
EndpointSetup<DefaultServer>(b => b.UseClaimCheck(sp => new MyDataBus(sp.GetRequiredService<Context>()), new SystemJsonClaimCheckSerializer()));
56-
}
51+
public ReceiverViaFluent() => EndpointSetup<DefaultServer>(b => b.UseClaimCheck(sp => new MyDataBus(sp.GetRequiredService<Context>()), new SystemJsonClaimCheckSerializer()));
5752

58-
public class MyMessageHandler : IHandleMessages<MyMessageWithLargePayload>
53+
public class MyMessageHandler(Context testContext) : IHandleMessages<MyMessageWithLargePayload>
5954
{
60-
public MyMessageHandler(Context context)
61-
{
62-
testContext = context;
63-
}
64-
6555
public Task Handle(MyMessageWithLargePayload messageWithLargePayload, IMessageHandlerContext context)
6656
{
6757
testContext.ReceivedPayload = messageWithLargePayload.Payload.Value;
6858

6959
return Task.CompletedTask;
7060
}
71-
72-
Context testContext;
7361
}
7462
}
7563

76-
public class MyDataBus : IClaimCheck
64+
public class MyDataBus(Context context) : IClaimCheck
7765
{
78-
Context context;
79-
public MyDataBus(Context context)
80-
{
81-
this.context = context;
82-
}
83-
8466
public Task<Stream> Get(string key, CancellationToken cancellationToken = default)
8567
{
8668
var fileStream = new FileStream(context.TempPath, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, true);
@@ -96,10 +78,7 @@ public Task<string> Put(Stream stream, TimeSpan timeToBeReceived, CancellationTo
9678
return Task.FromResult("key");
9779
}
9880

99-
public Task Start(CancellationToken cancellationToken = default)
100-
{
101-
return Task.CompletedTask;
102-
}
81+
public Task Start(CancellationToken cancellationToken = default) => Task.CompletedTask;
10382
}
10483

10584

0 commit comments

Comments
 (0)