Skip to content

Commit 7374839

Browse files
zaruszzarusz
committed
Cleanup
Signed-off-by: Tomasz Maruszak <maruszaktomasz@gmail.com>
1 parent c653493 commit 7374839

File tree

11 files changed

+64
-75
lines changed

11 files changed

+64
-75
lines changed

‎src/.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
103103
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
104104
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
105105
csharp_style_prefer_primary_constructors = true:suggestion
106+
csharp_prefer_system_threading_lock = true:suggestion
107+
dotnet_diagnostic.xUnit1045.severity = silent
106108

107109
[*.{cs,vb}]
108110
#### Naming styles ####
@@ -186,6 +188,7 @@ dotnet_style_qualification_for_event = false:suggestion
186188
dotnet_diagnostic.VSTHRD200.severity = none
187189
# not supported by .netstandard2.0
188190
dotnet_diagnostic.CA1510.severity = none
191+
dotnet_diagnostic.CA1512.severity = none
189192

190193
[*.{csproj,xml}]
191194
indent_style = space

‎src/SlimMessageBus.Host.Outbox/Services/OutboxLockRenewalTimerFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class OutboxLockRenewalTimerFactory<TOutboxMessage, TOutboxMessageKey>(IS
99
private bool _isDisposed = false;
1010

1111
public IOutboxLockRenewalTimer CreateRenewalTimer(TimeSpan lockDuration, TimeSpan interval, Action<Exception> lockLost, CancellationToken cancellationToken)
12-
=> (OutboxLockRenewalTimer<TOutboxMessage, TOutboxMessageKey>)ActivatorUtilities.CreateInstance(_scope.ServiceProvider, typeof(OutboxLockRenewalTimer<TOutboxMessage, TOutboxMessageKey>), lockDuration, interval, lockLost, cancellationToken);
12+
=> ActivatorUtilities.CreateInstance<OutboxLockRenewalTimer<TOutboxMessage, TOutboxMessageKey>>(_scope.ServiceProvider);
1313

1414
public async ValueTask DisposeAsync()
1515
{

‎src/SlimMessageBus.Host/Consumer/MessageProcessors/MessageHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public MessageHandler(
104104
catch (Exception ex)
105105
{
106106
attempts++;
107-
var handleErrorResult = await DoHandleError(message, messageType, messageScope, consumerContext, ex, attempts, cancellationToken).ConfigureAwait(false);
107+
var handleErrorResult = await DoHandleError(message, messageType, messageScope, consumerContext, ex, attempts).ConfigureAwait(false);
108108
if (handleErrorResult is ProcessResult.RetryState)
109109
{
110110
continue;
@@ -144,7 +144,7 @@ private async Task<object> DoHandleInternal(object message, IMessageTypeConsumer
144144
return await ExecuteConsumer(message, consumerContext, consumerInvoker, responseType).ConfigureAwait(false);
145145
}
146146

147-
private async Task<ProcessResult> DoHandleError(object message, Type messageType, IMessageScope messageScope, IConsumerContext consumerContext, Exception ex, int attempts, CancellationToken cancellationToken)
147+
private async Task<ProcessResult> DoHandleError(object message, Type messageType, IMessageScope messageScope, IConsumerContext consumerContext, Exception ex, int attempts)
148148
{
149149
var errorHandlerResult = ProcessResult.Failure;
150150

‎src/SlimMessageBus.Host/Consumer/MessageProcessors/ResponseMessageProcessor.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ private Exception OnResponseArrived(TTransportMessage transportMessage, string p
6969
if (requestState == null)
7070
{
7171
LogResponseWillBeDiscarded(path, requestId);
72-
// ToDo: add and API hook to these kind of situation
7372
return null;
7473
}
7574

‎src/Tests/SlimMessageBus.Host.Configuration.Test/ConsumerBuilderTest.cs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void Given_MessageType_When_Configured_Then_MessageType_ProperlySet_And_C
2222
// assert
2323
subject.ConsumerSettings.ConsumerMode.Should().Be(ConsumerMode.Consumer);
2424
subject.ConsumerSettings.ConsumerType.Should().BeNull();
25-
subject.ConsumerSettings.MessageType.Should().Be(typeof(SomeMessage));
25+
subject.ConsumerSettings.MessageType.Should().Be<SomeMessage>();
2626
}
2727

2828
[Theory]
@@ -95,36 +95,36 @@ public void Given_BaseMessageType_And_ItsHierarchy_When_WithConsumer_ForTheBaseT
9595
subject.ConsumerSettings.ResponseType.Should().BeNull();
9696

9797
subject.ConsumerSettings.ConsumerMode.Should().Be(ConsumerMode.Consumer);
98-
subject.ConsumerSettings.ConsumerType.Should().Be(typeof(BaseMessageConsumer));
98+
subject.ConsumerSettings.ConsumerType.Should().Be<BaseMessageConsumer>();
9999
Func<Task> call = () => subject.ConsumerSettings.ConsumerMethod(new BaseMessageConsumer(), new BaseMessage(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
100100
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(BaseMessage));
101101

102102
subject.ConsumerSettings.Invokers.Count.Should().Be(4);
103103

104104
var consumerInvokerSettings = subject.ConsumerSettings.Invokers.Single(x => x.MessageType == typeof(BaseMessage));
105-
consumerInvokerSettings.MessageType.Should().Be(typeof(BaseMessage));
106-
consumerInvokerSettings.ConsumerType.Should().Be(typeof(BaseMessageConsumer));
105+
consumerInvokerSettings.MessageType.Should().Be<BaseMessage>();
106+
consumerInvokerSettings.ConsumerType.Should().Be<BaseMessageConsumer>();
107107
consumerInvokerSettings.ParentSettings.Should().BeSameAs(subject.ConsumerSettings);
108108
call = () => consumerInvokerSettings.ConsumerMethod(new BaseMessageConsumer(), new BaseMessage(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
109109
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(BaseMessage));
110110

111111
consumerInvokerSettings = subject.ConsumerSettings.Invokers.Single(x => x.MessageType == typeof(DerivedAMessage));
112-
consumerInvokerSettings.MessageType.Should().Be(typeof(DerivedAMessage));
113-
consumerInvokerSettings.ConsumerType.Should().Be(typeof(DerivedAMessageConsumer));
112+
consumerInvokerSettings.MessageType.Should().Be<DerivedAMessage>();
113+
consumerInvokerSettings.ConsumerType.Should().Be<DerivedAMessageConsumer>();
114114
consumerInvokerSettings.ParentSettings.Should().BeSameAs(subject.ConsumerSettings);
115115
call = () => consumerInvokerSettings.ConsumerMethod(new DerivedAMessageConsumer(), new DerivedAMessage(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
116116
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(DerivedAMessage));
117117

118118
consumerInvokerSettings = subject.ConsumerSettings.Invokers.Single(x => x.MessageType == typeof(DerivedBMessage));
119-
consumerInvokerSettings.MessageType.Should().Be(typeof(DerivedBMessage));
120-
consumerInvokerSettings.ConsumerType.Should().Be(typeof(DerivedBMessageConsumer));
119+
consumerInvokerSettings.MessageType.Should().Be<DerivedBMessage>();
120+
consumerInvokerSettings.ConsumerType.Should().Be<DerivedBMessageConsumer>();
121121
consumerInvokerSettings.ParentSettings.Should().BeSameAs(subject.ConsumerSettings);
122122
call = () => consumerInvokerSettings.ConsumerMethod(new DerivedBMessageConsumer(), new DerivedBMessage(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
123123
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(DerivedBMessage));
124124

125125
consumerInvokerSettings = subject.ConsumerSettings.Invokers.Single(x => x.MessageType == typeof(Derived2AMessage));
126-
consumerInvokerSettings.MessageType.Should().Be(typeof(Derived2AMessage));
127-
consumerInvokerSettings.ConsumerType.Should().Be(typeof(Derived2AMessageConsumer));
126+
consumerInvokerSettings.MessageType.Should().Be<Derived2AMessage>();
127+
consumerInvokerSettings.ConsumerType.Should().Be<Derived2AMessageConsumer>();
128128
consumerInvokerSettings.ParentSettings.Should().BeSameAs(subject.ConsumerSettings);
129129
call = () => consumerInvokerSettings.ConsumerMethod(new Derived2AMessageConsumer(), new Derived2AMessage(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
130130
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(Derived2AMessage));
@@ -149,36 +149,36 @@ public void Given_BaseMessageType_And_ItsHierarchy_And_ConsumerOfContext_When_Wi
149149
subject.ConsumerSettings.ResponseType.Should().BeNull();
150150

151151
subject.ConsumerSettings.ConsumerMode.Should().Be(ConsumerMode.Consumer);
152-
subject.ConsumerSettings.ConsumerType.Should().Be(typeof(BaseMessageConsumerOfContext));
152+
subject.ConsumerSettings.ConsumerType.Should().Be<BaseMessageConsumerOfContext>();
153153
Func<Task> call = () => subject.ConsumerSettings.ConsumerMethod(new BaseMessageConsumerOfContext(), new BaseMessage(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
154154
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(BaseMessage));
155155

156156
subject.ConsumerSettings.Invokers.Count.Should().Be(4);
157157

158158
var consumerInvokerSettings = subject.ConsumerSettings.Invokers.Single(x => x.MessageType == typeof(BaseMessage));
159-
consumerInvokerSettings.MessageType.Should().Be(typeof(BaseMessage));
160-
consumerInvokerSettings.ConsumerType.Should().Be(typeof(BaseMessageConsumerOfContext));
159+
consumerInvokerSettings.MessageType.Should().Be<BaseMessage>();
160+
consumerInvokerSettings.ConsumerType.Should().Be<BaseMessageConsumerOfContext>();
161161
consumerInvokerSettings.ParentSettings.Should().BeSameAs(subject.ConsumerSettings);
162162
call = () => consumerInvokerSettings.ConsumerMethod(new BaseMessageConsumerOfContext(), new BaseMessage(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
163163
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(BaseMessage));
164164

165165
consumerInvokerSettings = subject.ConsumerSettings.Invokers.Single(x => x.MessageType == typeof(DerivedAMessage));
166-
consumerInvokerSettings.MessageType.Should().Be(typeof(DerivedAMessage));
167-
consumerInvokerSettings.ConsumerType.Should().Be(typeof(DerivedAMessageConsumerOfContext));
166+
consumerInvokerSettings.MessageType.Should().Be<DerivedAMessage>();
167+
consumerInvokerSettings.ConsumerType.Should().Be<DerivedAMessageConsumerOfContext>();
168168
consumerInvokerSettings.ParentSettings.Should().BeSameAs(subject.ConsumerSettings);
169169
call = () => consumerInvokerSettings.ConsumerMethod(new DerivedAMessageConsumerOfContext(), new DerivedAMessage(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
170170
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(DerivedAMessage));
171171

172172
consumerInvokerSettings = subject.ConsumerSettings.Invokers.Single(x => x.MessageType == typeof(DerivedBMessage));
173-
consumerInvokerSettings.MessageType.Should().Be(typeof(DerivedBMessage));
174-
consumerInvokerSettings.ConsumerType.Should().Be(typeof(DerivedBMessageConsumerOfContext));
173+
consumerInvokerSettings.MessageType.Should().Be<DerivedBMessage>();
174+
consumerInvokerSettings.ConsumerType.Should().Be<DerivedBMessageConsumerOfContext>();
175175
consumerInvokerSettings.ParentSettings.Should().BeSameAs(subject.ConsumerSettings);
176176
call = () => consumerInvokerSettings.ConsumerMethod(new DerivedBMessageConsumerOfContext(), new DerivedBMessage(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
177177
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(DerivedBMessage));
178178

179179
consumerInvokerSettings = subject.ConsumerSettings.Invokers.Single(x => x.MessageType == typeof(Derived2AMessage));
180-
consumerInvokerSettings.MessageType.Should().Be(typeof(Derived2AMessage));
181-
consumerInvokerSettings.ConsumerType.Should().Be(typeof(Derived2AMessageConsumerOfContext));
180+
consumerInvokerSettings.MessageType.Should().Be<Derived2AMessage>();
181+
consumerInvokerSettings.ConsumerType.Should().Be<Derived2AMessageConsumerOfContext>();
182182
consumerInvokerSettings.ParentSettings.Should().BeSameAs(subject.ConsumerSettings);
183183
call = () => consumerInvokerSettings.ConsumerMethod(new Derived2AMessageConsumerOfContext(), new Derived2AMessage(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
184184
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(Derived2AMessage));
@@ -198,25 +198,25 @@ public void Given_BaseRequestType_And_ItsHierarchy_When_WithConsumer_ForTheBaseT
198198
.WithConsumer<DerivedRequestConsumer, DerivedRequest>();
199199

200200
// assert
201-
subject.ConsumerSettings.ResponseType.Should().Be(typeof(BaseResponse));
201+
subject.ConsumerSettings.ResponseType.Should().Be<BaseResponse>();
202202

203203
subject.ConsumerSettings.ConsumerMode.Should().Be(ConsumerMode.Consumer);
204-
subject.ConsumerSettings.ConsumerType.Should().Be(typeof(BaseRequestConsumer));
204+
subject.ConsumerSettings.ConsumerType.Should().Be<BaseRequestConsumer>();
205205
Func<Task> call = () => subject.ConsumerSettings.ConsumerMethod(new BaseRequestConsumer(), new BaseRequest(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
206206
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(BaseRequest));
207207

208208
subject.ConsumerSettings.Invokers.Count.Should().Be(2);
209209

210210
var consumerInvokerSettings = subject.ConsumerSettings.Invokers.Single(x => x.MessageType == typeof(BaseRequest));
211-
consumerInvokerSettings.MessageType.Should().Be(typeof(BaseRequest));
212-
consumerInvokerSettings.ConsumerType.Should().Be(typeof(BaseRequestConsumer));
211+
consumerInvokerSettings.MessageType.Should().Be<BaseRequest>();
212+
consumerInvokerSettings.ConsumerType.Should().Be<BaseRequestConsumer>();
213213
consumerInvokerSettings.ParentSettings.Should().BeSameAs(subject.ConsumerSettings);
214214
call = () => consumerInvokerSettings.ConsumerMethod(new BaseRequestConsumer(), new BaseRequest(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
215215
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(BaseRequest));
216216

217217
consumerInvokerSettings = subject.ConsumerSettings.Invokers.Single(x => x.MessageType == typeof(DerivedRequest));
218-
consumerInvokerSettings.MessageType.Should().Be(typeof(DerivedRequest));
219-
consumerInvokerSettings.ConsumerType.Should().Be(typeof(DerivedRequestConsumer));
218+
consumerInvokerSettings.MessageType.Should().Be<DerivedRequest>();
219+
consumerInvokerSettings.ConsumerType.Should().Be<DerivedRequestConsumer>();
220220
consumerInvokerSettings.ParentSettings.Should().BeSameAs(subject.ConsumerSettings);
221221
call = () => consumerInvokerSettings.ConsumerMethod(new DerivedRequestConsumer(), new DerivedRequest(), consumerContextMock.Object, consumerContextMock.Object.CancellationToken);
222222
call.Should().ThrowAsync<NotImplementedException>().WithMessage(nameof(DerivedRequest));

‎src/Tests/SlimMessageBus.Host.Configuration.Test/HandlerBuilderTest.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public void When_Created_Given_RequestAndResposeType_Then_MessageType_And_Respon
2020
var subject = new HandlerBuilder<SomeRequest, SomeResponse>(_messageBusSettings);
2121

2222
// assert
23-
subject.ConsumerSettings.MessageType.Should().Be(typeof(SomeRequest));
24-
subject.ConsumerSettings.ResponseType.Should().Be(typeof(SomeResponse));
23+
subject.ConsumerSettings.MessageType.Should().Be<SomeRequest>();
24+
subject.ConsumerSettings.ResponseType.Should().Be<SomeResponse>();
2525
subject.ConsumerSettings.ConsumerMode.Should().Be(ConsumerMode.RequestResponse);
2626
subject.ConsumerSettings.ConsumerType.Should().BeNull();
2727
subject.ConsumerSettings.Invokers.Should().BeEmpty();
@@ -34,7 +34,7 @@ public void When_Created_Given_RequestWithoutResposeType_Then_MessageType_And_De
3434
var subject = new HandlerBuilder<SomeRequestWithoutResponse>(_messageBusSettings);
3535

3636
// assert
37-
subject.ConsumerSettings.MessageType.Should().Be(typeof(SomeRequestWithoutResponse));
37+
subject.ConsumerSettings.MessageType.Should().Be<SomeRequestWithoutResponse>();
3838
subject.ConsumerSettings.ResponseType.Should().BeNull();
3939
subject.ConsumerSettings.ConsumerMode.Should().Be(ConsumerMode.RequestResponse);
4040
subject.ConsumerSettings.ConsumerType.Should().BeNull();
@@ -101,14 +101,14 @@ public void When_Configured_Given_RequestResponse_Then_ProperSettings(bool ofCon
101101
}
102102

103103
// assert
104-
subject.ConsumerSettings.MessageType.Should().Be(typeof(SomeRequest));
104+
subject.ConsumerSettings.MessageType.Should().Be<SomeRequest>();
105105
subject.ConsumerSettings.Path.Should().Be(_path);
106106
subject.ConsumerSettings.Instances.Should().Be(3);
107107

108108
subject.ConsumerSettings.ConsumerType.Should().Be(consumerType);
109109
subject.ConsumerSettings.ConsumerMode.Should().Be(ConsumerMode.RequestResponse);
110110

111-
subject.ConsumerSettings.ResponseType.Should().Be(typeof(SomeResponse));
111+
subject.ConsumerSettings.ResponseType.Should().Be<SomeResponse>();
112112

113113
subject.ConsumerSettings.Invokers.Count.Should().Be(2);
114114

@@ -153,7 +153,7 @@ public void When_Configured_Given_RequestWithoutResponse_And_HandlersWithDerived
153153
}
154154

155155
// assert
156-
subject.ConsumerSettings.MessageType.Should().Be(typeof(SomeRequestWithoutResponse));
156+
subject.ConsumerSettings.MessageType.Should().Be<SomeRequestWithoutResponse>();
157157
subject.ConsumerSettings.Path.Should().Be(_path);
158158
subject.ConsumerSettings.Instances.Should().Be(3);
159159

‎src/Tests/SlimMessageBus.Host.Configuration.Test/TypeCollectionTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public void Add_Should_AddTypeToCollection_IfAssignableToGeneric()
99
var collection = new TypeCollection<ISampleInterface>();
1010

1111
// Act
12-
collection.Add(typeof(SampleClass));
12+
collection.Add<SampleClass>();
1313

1414
// Assert
1515
collection.Count.Should().Be(1);
@@ -37,7 +37,7 @@ public void Add_Should_ThrowException_WhenTypeIsAssignableToGenericButAlreadyExi
3737
collection.Add<SampleClass>();
3838

3939
// Act
40-
Action act = () => collection.Add(typeof(SampleClass));
40+
Action act = () => collection.Add<SampleClass>();
4141

4242
// Assert
4343
act.Should().Throw<ArgumentException>().WithMessage("Type already exists in the collection. (Parameter 'type')");
@@ -169,7 +169,7 @@ public void Remove_Should_RemoveTypeFromCollection_WhenSuppliedAsType()
169169
collection.Add<SampleClass>();
170170

171171
// Act
172-
var removed = collection.Remove(typeof(SampleClass));
172+
var removed = collection.Remove<SampleClass>();
173173

174174
// Assert
175175
removed.Should().BeTrue();

‎src/Tests/SlimMessageBus.Host.Integration.Test/HybridTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ public async Task When_PublishToMemoryBus_Given_InsideConsumerWithMessageScope_T
115115
// all the internal messages should be processed by Memory bus
116116
store
117117
.Where(x => x.Name == nameof(InternalMessageConsumer) || x.Name == nameof(InternalMessageConsumerInterceptor) || x.Name == nameof(InternalMessageProducerInterceptor) || x.Name == nameof(InternalMessagePublishInterceptor))
118-
.Should().AllSatisfy(x => x.ContextMessageBusType.Should().Be(typeof(MemoryMessageBus)));
118+
.Should().AllSatisfy(x => x.ContextMessageBusType.Should().Be<MemoryMessageBus>());
119119

120120
// all the external messages should be processed by Azure Service Bus
121121
store
122122
.Where(x => x.Name == nameof(ExternalMessageConsumer) || x.Name == nameof(ExternalMessageConsumerInterceptor))
123-
.Should().AllSatisfy(x => x.ContextMessageBusType.Should().Be(typeof(ServiceBusMessageBus)));
123+
.Should().AllSatisfy(x => x.ContextMessageBusType.Should().Be<ServiceBusMessageBus>());
124124

125125
// in this order
126126
var eventsThatHappenedWhenExternalWasPublished = grouping.Values.SingleOrDefault(x => x.Count == 2);

0 commit comments

Comments
 (0)