Code style cleanup
This commit is contained in:
parent
302e6a0a42
commit
b816e56018
@ -23,7 +23,7 @@ namespace _01_PublishSubscribe
|
|||||||
{
|
{
|
||||||
public class Program
|
public class Program
|
||||||
{
|
{
|
||||||
public static void Main(string[] args)
|
public static void Main()
|
||||||
{
|
{
|
||||||
var dependencyResolver = GetSimpleInjectorDependencyResolver();
|
var dependencyResolver = GetSimpleInjectorDependencyResolver();
|
||||||
|
|
||||||
@ -47,7 +47,7 @@ namespace _01_PublishSubscribe
|
|||||||
.RegisterAllControllers()
|
.RegisterAllControllers()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
using (var connection = new TapetiConnection(config)
|
await using var connection = new TapetiConnection(config)
|
||||||
{
|
{
|
||||||
// Params is optional if you want to use the defaults, but we'll set it
|
// Params is optional if you want to use the defaults, but we'll set it
|
||||||
// explicitly for this example
|
// explicitly for this example
|
||||||
@ -63,8 +63,8 @@ namespace _01_PublishSubscribe
|
|||||||
{ "example", "01 - Publish Subscribe" }
|
{ "example", "01 - Publish Subscribe" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
};
|
||||||
{
|
|
||||||
// IoC containers that separate the builder from the resolver (Autofac) must be built after
|
// IoC containers that separate the builder from the resolver (Autofac) must be built after
|
||||||
// creating a TapetConnection, as it modifies the container by injecting IPublisher.
|
// creating a TapetConnection, as it modifies the container by injecting IPublisher.
|
||||||
(dependencyResolver as AutofacDependencyResolver)?.Build();
|
(dependencyResolver as AutofacDependencyResolver)?.Build();
|
||||||
@ -85,7 +85,6 @@ namespace _01_PublishSubscribe
|
|||||||
// Wait for the controller to signal that the message has been received
|
// Wait for the controller to signal that the message has been received
|
||||||
await waitForDone();
|
await waitForDone();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
internal static IDependencyContainer GetSimpleInjectorDependencyResolver()
|
internal static IDependencyContainer GetSimpleInjectorDependencyResolver()
|
||||||
|
@ -11,7 +11,7 @@ namespace _02_DeclareDurableQueues
|
|||||||
{
|
{
|
||||||
public class Program
|
public class Program
|
||||||
{
|
{
|
||||||
public static void Main(string[] args)
|
public static void Main()
|
||||||
{
|
{
|
||||||
var container = new Container();
|
var container = new Container();
|
||||||
var dependencyResolver = new SimpleInjectorDependencyResolver(container);
|
var dependencyResolver = new SimpleInjectorDependencyResolver(container);
|
||||||
@ -30,8 +30,8 @@ namespace _02_DeclareDurableQueues
|
|||||||
.EnableDeclareDurableQueues()
|
.EnableDeclareDurableQueues()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
using (var connection = new TapetiConnection(config))
|
await using var connection = new TapetiConnection(config);
|
||||||
{
|
|
||||||
// This creates or updates the durable queue
|
// This creates or updates the durable queue
|
||||||
await connection.Subscribe();
|
await connection.Subscribe();
|
||||||
|
|
||||||
@ -44,5 +44,4 @@ namespace _02_DeclareDurableQueues
|
|||||||
await waitForDone();
|
await waitForDone();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@ namespace _03_FlowRequestResponse
|
|||||||
{
|
{
|
||||||
public class Program
|
public class Program
|
||||||
{
|
{
|
||||||
public static void Main(string[] args)
|
public static void Main()
|
||||||
{
|
{
|
||||||
var container = new Container();
|
var container = new Container();
|
||||||
var dependencyResolver = new SimpleInjectorDependencyResolver(container);
|
var dependencyResolver = new SimpleInjectorDependencyResolver(container);
|
||||||
@ -33,8 +33,8 @@ namespace _03_FlowRequestResponse
|
|||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
|
|
||||||
using (var connection = new TapetiConnection(config))
|
await using var connection = new TapetiConnection(config);
|
||||||
{
|
|
||||||
// Must be called before using any flow. When using a persistent repository like the
|
// Must be called before using any flow. When using a persistent repository like the
|
||||||
// SQL server implementation, you can run any required update scripts (for example, using DbUp)
|
// SQL server implementation, you can run any required update scripts (for example, using DbUp)
|
||||||
// before calling this Load method.
|
// before calling this Load method.
|
||||||
@ -62,5 +62,4 @@ namespace _03_FlowRequestResponse
|
|||||||
await waitForDone();
|
await waitForDone();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -9,25 +9,17 @@ namespace _03_FlowRequestResponse
|
|||||||
public class ReceivingMessageController
|
public class ReceivingMessageController
|
||||||
{
|
{
|
||||||
// No publisher required, responses can simply be returned
|
// No publisher required, responses can simply be returned
|
||||||
|
#pragma warning disable CA1822 // Mark members as static - not supported yet by Tapeti
|
||||||
public async Task<QuoteResponseMessage> HandleQuoteRequest(QuoteRequestMessage message)
|
public async Task<QuoteResponseMessage> HandleQuoteRequest(QuoteRequestMessage message)
|
||||||
{
|
{
|
||||||
string quote;
|
var quote = message.Amount switch
|
||||||
|
|
||||||
switch (message.Amount)
|
|
||||||
{
|
{
|
||||||
case 1:
|
1 =>
|
||||||
// Well, they asked for it... :-)
|
// Well, they asked for it... :-)
|
||||||
quote = "'";
|
"'",
|
||||||
break;
|
2 => "\"",
|
||||||
|
_ => new string('\'', message.Amount)
|
||||||
case 2:
|
};
|
||||||
quote = "\"";
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
quote = new string('\'', message.Amount);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Just gonna let them wait for a bit, to demonstrate async message handlers
|
// Just gonna let them wait for a bit, to demonstrate async message handlers
|
||||||
await Task.Delay(1000);
|
await Task.Delay(1000);
|
||||||
@ -37,5 +29,6 @@ namespace _03_FlowRequestResponse
|
|||||||
Quote = quote
|
Quote = quote
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
#pragma warning restore CA1822
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,7 @@ namespace _04_Transient
|
|||||||
{
|
{
|
||||||
public class Program
|
public class Program
|
||||||
{
|
{
|
||||||
public static void Main(string[] args)
|
public static void Main()
|
||||||
{
|
{
|
||||||
var container = new Container();
|
var container = new Container();
|
||||||
var dependencyResolver = new SimpleInjectorDependencyResolver(container);
|
var dependencyResolver = new SimpleInjectorDependencyResolver(container);
|
||||||
@ -34,8 +34,7 @@ namespace _04_Transient
|
|||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
|
|
||||||
using (var connection = new TapetiConnection(config))
|
await using var connection = new TapetiConnection(config);
|
||||||
{
|
|
||||||
await connection.Subscribe();
|
await connection.Subscribe();
|
||||||
|
|
||||||
|
|
||||||
@ -51,5 +50,4 @@ namespace _04_Transient
|
|||||||
// Unlike the other example, there is no need to call waitForDone, once we're here the response has been handled.
|
// Unlike the other example, there is no need to call waitForDone, once we're here the response has been handled.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -21,7 +21,7 @@ namespace _05_SpeedTest
|
|||||||
private const int ConcurrentTasks = 20;
|
private const int ConcurrentTasks = 20;
|
||||||
|
|
||||||
|
|
||||||
public static void Main(string[] args)
|
public static void Main()
|
||||||
{
|
{
|
||||||
var container = new Container();
|
var container = new Container();
|
||||||
var dependencyResolver = new SimpleInjectorDependencyResolver(container);
|
var dependencyResolver = new SimpleInjectorDependencyResolver(container);
|
||||||
@ -52,8 +52,7 @@ namespace _05_SpeedTest
|
|||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
|
|
||||||
using (var connection = new TapetiConnection(config))
|
await using var connection = new TapetiConnection(config);
|
||||||
{
|
|
||||||
var subscriber = await connection.Subscribe(false);
|
var subscriber = await connection.Subscribe(false);
|
||||||
|
|
||||||
|
|
||||||
@ -80,7 +79,6 @@ namespace _05_SpeedTest
|
|||||||
stopwatch.Stop();
|
stopwatch.Stop();
|
||||||
Console.WriteLine($"Took {stopwatch.ElapsedMilliseconds} ms, {MessageCount / (stopwatch.ElapsedMilliseconds / 1000F):F0} messages/sec");
|
Console.WriteLine($"Took {stopwatch.ElapsedMilliseconds} ms, {MessageCount / (stopwatch.ElapsedMilliseconds / 1000F):F0} messages/sec");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
internal static async Task PublishMessages(IPublisher publisher)
|
internal static async Task PublishMessages(IPublisher publisher)
|
||||||
|
@ -12,7 +12,7 @@ namespace _06_StatelessRequestResponse
|
|||||||
{
|
{
|
||||||
public class Program
|
public class Program
|
||||||
{
|
{
|
||||||
public static void Main(string[] args)
|
public static void Main()
|
||||||
{
|
{
|
||||||
var container = new Container();
|
var container = new Container();
|
||||||
var dependencyResolver = new SimpleInjectorDependencyResolver(container);
|
var dependencyResolver = new SimpleInjectorDependencyResolver(container);
|
||||||
@ -32,8 +32,7 @@ namespace _06_StatelessRequestResponse
|
|||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
|
|
||||||
using (var connection = new TapetiConnection(config))
|
await using var connection = new TapetiConnection(config);
|
||||||
{
|
|
||||||
await connection.Subscribe();
|
await connection.Subscribe();
|
||||||
|
|
||||||
var publisher = dependencyResolver.Resolve<IPublisher>();
|
var publisher = dependencyResolver.Resolve<IPublisher>();
|
||||||
@ -47,5 +46,4 @@ namespace _06_StatelessRequestResponse
|
|||||||
await waitForDone();
|
await waitForDone();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -8,31 +8,23 @@ namespace _06_StatelessRequestResponse
|
|||||||
public class ReceivingMessageController
|
public class ReceivingMessageController
|
||||||
{
|
{
|
||||||
// No publisher required, responses can simply be returned
|
// No publisher required, responses can simply be returned
|
||||||
|
#pragma warning disable CA1822 // Mark members as static - not supported yet by Tapeti
|
||||||
public QuoteResponseMessage HandleQuoteRequest(QuoteRequestMessage message)
|
public QuoteResponseMessage HandleQuoteRequest(QuoteRequestMessage message)
|
||||||
{
|
{
|
||||||
string quote;
|
var quote = message.Amount switch
|
||||||
|
|
||||||
switch (message.Amount)
|
|
||||||
{
|
{
|
||||||
case 1:
|
1 =>
|
||||||
// Well, they asked for it... :-)
|
// Well, they asked for it... :-)
|
||||||
quote = "'";
|
"'",
|
||||||
break;
|
2 => "\"",
|
||||||
|
_ => null
|
||||||
case 2:
|
};
|
||||||
quote = "\"";
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
// We have to return a response.
|
|
||||||
quote = null;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return new QuoteResponseMessage
|
return new QuoteResponseMessage
|
||||||
{
|
{
|
||||||
Quote = quote
|
Quote = quote
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
#pragma warning restore CA1822
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,9 +16,11 @@ namespace _07_ParallelizationTest
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#pragma warning disable IDE0060 // Remove unused parameter
|
||||||
public async Task HandleSpeedTestMessage(SpeedTestMessage message)
|
public async Task HandleSpeedTestMessage(SpeedTestMessage message)
|
||||||
{
|
{
|
||||||
await messageParallelization.WaitForBatch();
|
await messageParallelization.WaitForBatch();
|
||||||
}
|
}
|
||||||
|
#pragma warning restore IDE0060
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -105,8 +105,8 @@ namespace _07_ParallelizationTest
|
|||||||
private readonly Func<bool> done;
|
private readonly Func<bool> done;
|
||||||
private readonly Action<int> timeout;
|
private readonly Action<int> timeout;
|
||||||
private int count;
|
private int count;
|
||||||
private readonly object waitLock = new object();
|
private readonly object waitLock = new();
|
||||||
private TaskCompletionSource<bool> batchReachedTask = new TaskCompletionSource<bool>();
|
private TaskCompletionSource<bool> batchReachedTask = new();
|
||||||
private Timer messageExpectedTimer;
|
private Timer messageExpectedTimer;
|
||||||
private readonly TimeSpan messageExpectedTimeout = TimeSpan.FromMilliseconds(5000);
|
private readonly TimeSpan messageExpectedTimeout = TimeSpan.FromMilliseconds(5000);
|
||||||
|
|
||||||
@ -124,7 +124,7 @@ namespace _07_ParallelizationTest
|
|||||||
lock (waitLock)
|
lock (waitLock)
|
||||||
{
|
{
|
||||||
if (messageExpectedTimer == null)
|
if (messageExpectedTimer == null)
|
||||||
messageExpectedTimer = new Timer(state =>
|
messageExpectedTimer = new Timer(_ =>
|
||||||
{
|
{
|
||||||
timeout(count);
|
timeout(count);
|
||||||
}, null, messageExpectedTimeout, Timeout.InfiniteTimeSpan);
|
}, null, messageExpectedTimeout, Timeout.InfiniteTimeSpan);
|
||||||
|
@ -3,7 +3,6 @@ using System.Threading.Tasks;
|
|||||||
using ExampleLib;
|
using ExampleLib;
|
||||||
using Messaging.TapetiExample;
|
using Messaging.TapetiExample;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using Serilog.Events;
|
|
||||||
using SimpleInjector;
|
using SimpleInjector;
|
||||||
using Tapeti;
|
using Tapeti;
|
||||||
using Tapeti.Serilog;
|
using Tapeti.Serilog;
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Reflection;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Tapeti.Config;
|
using Tapeti.Config;
|
||||||
using Tapeti.Flow.FlowHelpers;
|
using Tapeti.Flow.FlowHelpers;
|
||||||
|
@ -325,7 +325,7 @@ namespace Tapeti.Flow.Default
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public IFlowParallelRequestBuilder InternalAddRequest(object message, Delegate responseHandler)
|
private IFlowParallelRequestBuilder InternalAddRequest(object message, Delegate responseHandler)
|
||||||
{
|
{
|
||||||
requests.Add(new RequestInfo
|
requests.Add(new RequestInfo
|
||||||
{
|
{
|
||||||
|
@ -17,6 +17,11 @@
|
|||||||
<NoWarn>1701;1702</NoWarn>
|
<NoWarn>1701;1702</NoWarn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
|
||||||
|
<!-- Supress 'Use switch expression' which requires language version 8 not available in .NET Standard 2.0 -->
|
||||||
|
<NoWarn>IDE0066</NoWarn>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
public class ControllerMessageContextPayload : IMessageContextPayload
|
public class ControllerMessageContextPayload : IMessageContextPayload
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// An instance of the controller referenced by the binding. Note: can be null during Cleanup.
|
/// An instance of the controller referenced by the binding. Note: can be null during Cleanup or when bound to static methods.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public object Controller { get; }
|
public object Controller { get; }
|
||||||
|
|
||||||
|
@ -663,7 +663,7 @@ namespace Tapeti.Connection
|
|||||||
}
|
}
|
||||||
catch (WebException e)
|
catch (WebException e)
|
||||||
{
|
{
|
||||||
if (!(e.Response is HttpWebResponse response))
|
if (e.Response is not HttpWebResponse response)
|
||||||
throw;
|
throw;
|
||||||
|
|
||||||
if (!TransientStatusCodes.Contains(response.StatusCode))
|
if (!TransientStatusCodes.Contains(response.StatusCode))
|
||||||
@ -714,7 +714,7 @@ namespace Tapeti.Connection
|
|||||||
? publishChannelModel
|
? publishChannelModel
|
||||||
: consumeChannelModel;
|
: consumeChannelModel;
|
||||||
|
|
||||||
if (channel != null && channel.IsOpen)
|
if (channel is { IsOpen: true })
|
||||||
return channel;
|
return channel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ namespace Tapeti.Default
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public object Deserialize(byte[] body, IMessageProperties properties)
|
public object Deserialize(byte[] body, IMessageProperties properties)
|
||||||
{
|
{
|
||||||
if (properties.ContentType == null || !properties.ContentType.Equals(ContentType))
|
if (properties.ContentType is not ContentType)
|
||||||
throw new ArgumentException($"content_type must be {ContentType}");
|
throw new ArgumentException($"content_type must be {ContentType}");
|
||||||
|
|
||||||
var typeName = properties.GetHeader(ClassTypeHeader);
|
var typeName = properties.GetHeader(ClassTypeHeader);
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
|
// ReSharper disable UnusedMember.Global - public API
|
||||||
|
|
||||||
namespace Tapeti.Helpers
|
namespace Tapeti.Helpers
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -189,7 +189,7 @@ namespace Tapeti
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected void RegisterDefaults()
|
protected void RegisterDefaults()
|
||||||
{
|
{
|
||||||
if (!(DependencyResolver is IDependencyContainer container))
|
if (DependencyResolver is not IDependencyContainer container)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (ConsoleHelper.IsAvailable())
|
if (ConsoleHelper.IsAvailable())
|
||||||
|
@ -79,7 +79,7 @@ namespace Tapeti
|
|||||||
}
|
}
|
||||||
|
|
||||||
var methodQueueInfo = GetQueueInfo(method) ?? controllerQueueInfo;
|
var methodQueueInfo = GetQueueInfo(method) ?? controllerQueueInfo;
|
||||||
if (methodQueueInfo == null || !methodQueueInfo.IsValid)
|
if (methodQueueInfo is not { IsValid: true })
|
||||||
throw new TopologyConfigurationException(
|
throw new TopologyConfigurationException(
|
||||||
$"Method {method.Name} or controller {controller.Name} requires a queue attribute");
|
$"Method {method.Name} or controller {controller.Name} requires a queue attribute");
|
||||||
|
|
||||||
|
@ -164,7 +164,7 @@ namespace Tapeti
|
|||||||
|
|
||||||
var reconnectedEvent = Reconnected;
|
var reconnectedEvent = Reconnected;
|
||||||
if (reconnectedEvent != null)
|
if (reconnectedEvent != null)
|
||||||
Task.Run(() => reconnectedEvent?.Invoke(this, e));
|
Task.Run(() => reconnectedEvent.Invoke(this, e));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
Loading…
Reference in New Issue
Block a user