Merge branch 'release/2.4'
This commit is contained in:
commit
504ade18f3
@ -7,11 +7,11 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Autofac" Version="4.9.4" />
|
||||
<PackageReference Include="Castle.Windsor" Version="5.0.0" />
|
||||
<PackageReference Include="Autofac" Version="6.2.0" />
|
||||
<PackageReference Include="Castle.Windsor" Version="5.1.1" />
|
||||
<PackageReference Include="Ninject" Version="3.3.4" />
|
||||
<PackageReference Include="SimpleInjector" Version="4.6.2" />
|
||||
<PackageReference Include="Unity" Version="5.11.1" />
|
||||
<PackageReference Include="SimpleInjector" Version="5.3.0" />
|
||||
<PackageReference Include="Unity" Version="5.11.10" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -17,6 +17,8 @@ using Tapeti.UnityContainer;
|
||||
using Unity;
|
||||
using Container = SimpleInjector.Container;
|
||||
|
||||
// ReSharper disable UnusedMember.Global
|
||||
|
||||
namespace _01_PublishSubscribe
|
||||
{
|
||||
public class Program
|
||||
|
@ -7,7 +7,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="SimpleInjector" Version="4.6.2" />
|
||||
<PackageReference Include="SimpleInjector" Version="5.3.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -7,7 +7,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="SimpleInjector" Version="4.6.2" />
|
||||
<PackageReference Include="SimpleInjector" Version="5.3.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -19,7 +19,7 @@ namespace _03_FlowRequestResponse
|
||||
|
||||
container.Register<ILogger, ConsoleLogger>();
|
||||
|
||||
var helper = new ExampleConsoleApp(dependencyResolver);
|
||||
var helper = new ExampleConsoleApp(dependencyResolver, 2);
|
||||
helper.Run(MainAsync);
|
||||
}
|
||||
|
||||
|
@ -65,9 +65,30 @@ namespace _03_FlowRequestResponse
|
||||
Console.WriteLine("[SimpleFlowController] Quote: " + message.Quote);
|
||||
|
||||
|
||||
// Test for issue #21: Same request/response twice in flow does not continue
|
||||
return flowProvider.YieldWithRequestSync<QuoteRequestMessage, QuoteResponseMessage>(
|
||||
new QuoteRequestMessage
|
||||
{
|
||||
Amount = 42
|
||||
},
|
||||
HandleQuoteResponse2);
|
||||
|
||||
|
||||
//exampleState.Done();
|
||||
//return flowProvider.End();
|
||||
}
|
||||
|
||||
|
||||
|
||||
[Continuation]
|
||||
public IYieldPoint HandleQuoteResponse2(QuoteResponseMessage message)
|
||||
{
|
||||
Console.WriteLine("[SimpleFlowController] Quote 2: " + message.Quote);
|
||||
|
||||
exampleState.Done();
|
||||
|
||||
return flowProvider.End();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -7,7 +7,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="SimpleInjector" Version="4.6.2" />
|
||||
<PackageReference Include="SimpleInjector" Version="5.3.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -7,7 +7,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="SimpleInjector" Version="4.6.2" />
|
||||
<PackageReference Include="SimpleInjector" Version="5.3.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -7,7 +7,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="SimpleInjector" Version="4.9.0" />
|
||||
<PackageReference Include="SimpleInjector" Version="5.3.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Tapeti;
|
||||
|
||||
@ -21,13 +22,18 @@ namespace ExampleLib
|
||||
public class ExampleConsoleApp
|
||||
{
|
||||
private readonly IDependencyContainer dependencyResolver;
|
||||
private readonly int expectedDoneCount;
|
||||
private int doneCount;
|
||||
private readonly TaskCompletionSource<bool> doneSignal = new TaskCompletionSource<bool>();
|
||||
|
||||
|
||||
/// <param name="dependencyResolver">Uses Tapeti's IDependencyContainer interface so you can easily switch an example to your favourite IoC container</param>
|
||||
public ExampleConsoleApp(IDependencyContainer dependencyResolver)
|
||||
/// <param name="expectedDoneCount"></param>
|
||||
public ExampleConsoleApp(IDependencyContainer dependencyResolver, int expectedDoneCount = 1)
|
||||
{
|
||||
this.dependencyResolver = dependencyResolver;
|
||||
this.expectedDoneCount = expectedDoneCount;
|
||||
|
||||
dependencyResolver.RegisterDefault<IExampleState>(() => new ExampleState(this));
|
||||
}
|
||||
|
||||
@ -85,6 +91,7 @@ namespace ExampleLib
|
||||
|
||||
internal void Done()
|
||||
{
|
||||
if (Interlocked.Increment(ref doneCount) == expectedDoneCount)
|
||||
doneSignal.TrySetResult(true);
|
||||
}
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -1,6 +1,4 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace Messaging.TapetiExample
|
||||
namespace Messaging.TapetiExample
|
||||
{
|
||||
public class SpeedTestMessage
|
||||
{
|
||||
|
@ -3,6 +3,13 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>Annotations for Tapeti</Description>
|
||||
<PackageTags>rabbitmq tapeti</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.Annotations.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -10,4 +17,11 @@
|
||||
<NoWarn>1701;1702</NoWarn>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.Annotations.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.Annotations</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti Annotations</title>
|
||||
<authors>Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.Annotations.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Annotations for Tapeti</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti</tags>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -33,7 +33,8 @@ namespace Tapeti.Autofac
|
||||
}
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public AutofacDependencyResolver(ContainerBuilder containerBuilder)
|
||||
{
|
||||
this.containerBuilder = containerBuilder;
|
||||
|
@ -3,15 +3,29 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>Autofac integration package for Tapeti</Description>
|
||||
<PackageTags>rabbitmq tapeti autofac</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.SimpleInjector.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Autofac" Version="4.9.4" />
|
||||
<PackageReference Include="Autofac" Version="6.2.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.SimpleInjector.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.Autofac</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti Autofac</title>
|
||||
<authors>Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.SimpleInjector.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Autofac integration package for Tapeti</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti autofac</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti" version="[$version$]" />
|
||||
<dependency id="Autofac" version="4.9.4" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -3,15 +3,29 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>Castle.Windsor integration package for Tapeti</Description>
|
||||
<PackageTags>rabbitmq tapeti castle windsor</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.SimpleInjector.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Castle.Windsor" Version="5.0.0" />
|
||||
<PackageReference Include="Castle.Windsor" Version="5.1.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.SimpleInjector.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.CastleWindsor</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti Castle Windsor</title>
|
||||
<authors>Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.SimpleInjector.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Castle.Windsor integration package for Tapeti</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti castle windsor</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti" version="[$version$]" />
|
||||
<dependency id="Castle.Windsor" version="5.0.0" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -13,7 +13,8 @@ namespace Tapeti.CastleWindsor
|
||||
private readonly IWindsorContainer container;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public WindsorDependencyResolver(IWindsorContainer container)
|
||||
{
|
||||
this.container = container;
|
||||
@ -51,7 +52,7 @@ namespace Tapeti.CastleWindsor
|
||||
container.Register(
|
||||
Component
|
||||
.For<TService>()
|
||||
.UsingFactoryMethod(() => factory())
|
||||
.UsingFactoryMethod(factory)
|
||||
);
|
||||
}
|
||||
|
||||
@ -83,7 +84,7 @@ namespace Tapeti.CastleWindsor
|
||||
container.Register(
|
||||
Component
|
||||
.For<TService>()
|
||||
.UsingFactoryMethod(() => factory())
|
||||
.UsingFactoryMethod(factory)
|
||||
.LifestyleSingleton()
|
||||
);
|
||||
}
|
||||
|
@ -33,7 +33,7 @@ namespace Tapeti.Cmd.Commands
|
||||
RoutingKey = result.RoutingKey,
|
||||
Queue = QueueName,
|
||||
Properties = result.BasicProperties,
|
||||
Body = result.Body
|
||||
Body = result.Body.ToArray()
|
||||
});
|
||||
|
||||
if (RemoveMessages)
|
||||
|
@ -15,7 +15,7 @@ namespace Tapeti.Cmd.Commands
|
||||
{
|
||||
var messageCount = 0;
|
||||
|
||||
foreach (var message in MessageSerializer.Deserialize())
|
||||
foreach (var message in MessageSerializer.Deserialize(channel))
|
||||
{
|
||||
rateLimiter.Execute(() =>
|
||||
{
|
||||
|
169
Tapeti.Cmd/Mock/MockBasicProperties.cs
Normal file
169
Tapeti.Cmd/Mock/MockBasicProperties.cs
Normal file
@ -0,0 +1,169 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using RabbitMQ.Client;
|
||||
|
||||
namespace Tapeti.Cmd.Mock
|
||||
{
|
||||
public class MockBasicProperties : IBasicProperties
|
||||
{
|
||||
public ushort ProtocolClassId { get; set; }
|
||||
public string ProtocolClassName { get; set; }
|
||||
|
||||
public void ClearAppId()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearClusterId()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearContentEncoding()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearContentType()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearCorrelationId()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearDeliveryMode()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearExpiration()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearHeaders()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearMessageId()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearPriority()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearReplyTo()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearTimestamp()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearType()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void ClearUserId()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsAppIdPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsClusterIdPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsContentEncodingPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsContentTypePresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsCorrelationIdPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsDeliveryModePresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsExpirationPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsHeadersPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsMessageIdPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsPriorityPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsReplyToPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsTimestampPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsTypePresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsUserIdPresent()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public string AppId { get; set; }
|
||||
public string ClusterId { get; set; }
|
||||
public string ContentEncoding { get; set; }
|
||||
public string ContentType { get; set; }
|
||||
public string CorrelationId { get; set; }
|
||||
public byte DeliveryMode { get; set; }
|
||||
public string Expiration { get; set; }
|
||||
public IDictionary<string, object> Headers { get; set; }
|
||||
public string MessageId { get; set; }
|
||||
public bool Persistent { get; set; }
|
||||
public byte Priority { get; set; }
|
||||
public string ReplyTo { get; set; }
|
||||
public PublicationAddress ReplyToAddress { get; set; }
|
||||
public AmqpTimestamp Timestamp { get; set; }
|
||||
public string Type { get; set; }
|
||||
public string UserId { get; set; }
|
||||
}
|
||||
}
|
@ -5,8 +5,8 @@ using System.IO;
|
||||
using System.Text;
|
||||
using CommandLine;
|
||||
using RabbitMQ.Client;
|
||||
using RabbitMQ.Client.Framing;
|
||||
using Tapeti.Cmd.Commands;
|
||||
using Tapeti.Cmd.Mock;
|
||||
using Tapeti.Cmd.RateLimiter;
|
||||
using Tapeti.Cmd.Serialization;
|
||||
|
||||
@ -256,7 +256,7 @@ namespace Tapeti.Cmd
|
||||
|
||||
private static IRateLimiter GetRateLimiter(int? maxRate)
|
||||
{
|
||||
if (maxRate.GetValueOrDefault() <= 0)
|
||||
if (!maxRate.HasValue || maxRate.Value <= 0)
|
||||
return new NoRateLimiter();
|
||||
|
||||
return new SpreadRateLimiter(maxRate.Value, TimeSpan.FromSeconds(1));
|
||||
@ -376,7 +376,7 @@ namespace Tapeti.Cmd
|
||||
Port = options.TargetPort ?? options.Port,
|
||||
VirtualHost = !string.IsNullOrEmpty(options.TargetVirtualHost) ? options.TargetVirtualHost : options.VirtualHost,
|
||||
UserName = !string.IsNullOrEmpty(options.TargetUsername) ? options.TargetUsername : options.Username,
|
||||
Password = !string.IsNullOrEmpty(options.TargetPassword) ? options.TargetPassword : options.Password,
|
||||
Password = !string.IsNullOrEmpty(options.TargetPassword) ? options.TargetPassword : options.Password
|
||||
};
|
||||
|
||||
return factory.CreateConnection();
|
||||
@ -417,7 +417,7 @@ namespace Tapeti.Cmd
|
||||
Queue = "example.queue",
|
||||
RoutingKey = "example.routing.key",
|
||||
DeliveryTag = 42,
|
||||
Properties = new BasicProperties
|
||||
Properties = new MockBasicProperties
|
||||
{
|
||||
ContentType = "application/json",
|
||||
DeliveryMode = 2,
|
||||
|
@ -6,7 +6,6 @@ using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using Newtonsoft.Json;
|
||||
using RabbitMQ.Client;
|
||||
using RabbitMQ.Client.Framing;
|
||||
|
||||
namespace Tapeti.Cmd.Serialization
|
||||
{
|
||||
@ -61,7 +60,7 @@ namespace Tapeti.Cmd.Serialization
|
||||
}
|
||||
|
||||
|
||||
public IEnumerable<Message> Deserialize()
|
||||
public IEnumerable<Message> Deserialize(IModel channel)
|
||||
{
|
||||
foreach (var file in Directory.GetFiles(path, "*.*.message.txt"))
|
||||
{
|
||||
@ -80,8 +79,13 @@ namespace Tapeti.Cmd.Serialization
|
||||
var infoJson = File.ReadAllText(infoFileName);
|
||||
var info = JsonConvert.DeserializeObject<EasyNetQMessageReceivedInfo>(infoJson);
|
||||
|
||||
if (info == null)
|
||||
continue;
|
||||
|
||||
var message = info.ToMessage();
|
||||
message.Properties = properties.ToBasicProperties();
|
||||
if (properties != null)
|
||||
message.Properties = properties.ToBasicProperties(channel);
|
||||
|
||||
message.Body = Encoding.UTF8.GetBytes(body);
|
||||
|
||||
yield return message;
|
||||
@ -117,13 +121,13 @@ namespace Tapeti.Cmd.Serialization
|
||||
if (!basicProperties.IsHeadersPresent())
|
||||
return;
|
||||
|
||||
foreach (var header in basicProperties.Headers)
|
||||
Headers.Add(header.Key, (byte[])header.Value);
|
||||
foreach (var (key, value) in basicProperties.Headers)
|
||||
Headers.Add(key, (byte[])value);
|
||||
}
|
||||
|
||||
public IBasicProperties ToBasicProperties()
|
||||
public IBasicProperties ToBasicProperties(IModel channel)
|
||||
{
|
||||
var basicProperties = new BasicProperties();
|
||||
var basicProperties = channel.CreateBasicProperties();
|
||||
|
||||
if (ContentTypePresent) basicProperties.ContentType = ContentType;
|
||||
if (ContentEncodingPresent) basicProperties.ContentEncoding = ContentEncoding;
|
||||
@ -169,6 +173,7 @@ namespace Tapeti.Cmd.Serialization
|
||||
public IDictionary<string, byte[]> Headers
|
||||
{
|
||||
get => headers;
|
||||
// ReSharper disable once UnusedMember.Local
|
||||
set { headers = value; HeadersPresent = true; }
|
||||
}
|
||||
|
||||
@ -268,6 +273,7 @@ namespace Tapeti.Cmd.Serialization
|
||||
|
||||
private class EasyNetQMessageReceivedInfo
|
||||
{
|
||||
// ReSharper disable once UnusedAutoPropertyAccessor.Local - used by JSON deserialization
|
||||
public string ConsumerTag { get; set; }
|
||||
public ulong DeliverTag { get; set; }
|
||||
public bool Redelivered { get; set; }
|
||||
|
@ -19,6 +19,6 @@ namespace Tapeti.Cmd.Serialization
|
||||
public interface IMessageSerializer : IDisposable
|
||||
{
|
||||
void Serialize(Message message);
|
||||
IEnumerable<Message> Deserialize();
|
||||
IEnumerable<Message> Deserialize(IModel channel);
|
||||
}
|
||||
}
|
||||
|
@ -5,7 +5,6 @@ using System.Text;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using RabbitMQ.Client;
|
||||
using RabbitMQ.Client.Framing;
|
||||
|
||||
namespace Tapeti.Cmd.Serialization
|
||||
{
|
||||
@ -42,7 +41,7 @@ namespace Tapeti.Cmd.Serialization
|
||||
}
|
||||
|
||||
|
||||
public IEnumerable<Message> Deserialize()
|
||||
public IEnumerable<Message> Deserialize(IModel channel)
|
||||
{
|
||||
using (var reader = new StreamReader(stream, encoding))
|
||||
{
|
||||
@ -56,7 +55,7 @@ namespace Tapeti.Cmd.Serialization
|
||||
if (serializableMessage == null)
|
||||
continue;
|
||||
|
||||
yield return serializableMessage.ToMessage();
|
||||
yield return serializableMessage.ToMessage(channel);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -134,7 +133,7 @@ namespace Tapeti.Cmd.Serialization
|
||||
}
|
||||
|
||||
|
||||
public Message ToMessage()
|
||||
public Message ToMessage(IModel channel)
|
||||
{
|
||||
return new Message
|
||||
{
|
||||
@ -143,7 +142,7 @@ namespace Tapeti.Cmd.Serialization
|
||||
Exchange = Exchange,
|
||||
RoutingKey = RoutingKey,
|
||||
Queue = Queue,
|
||||
Properties = Properties.ToBasicProperties(),
|
||||
Properties = Properties.ToBasicProperties(channel),
|
||||
Body = Body != null
|
||||
? Encoding.UTF8.GetBytes(Body.ToString(Formatting.None))
|
||||
: RawBody
|
||||
@ -198,17 +197,17 @@ namespace Tapeti.Cmd.Serialization
|
||||
Headers = new Dictionary<string, string>();
|
||||
|
||||
// This assumes header values are UTF-8 encoded strings. This is true for Tapeti.
|
||||
foreach (var pair in fromProperties.Headers)
|
||||
Headers.Add(pair.Key, Encoding.UTF8.GetString((byte[])pair.Value));
|
||||
foreach (var (key, value) in fromProperties.Headers)
|
||||
Headers.Add(key, Encoding.UTF8.GetString((byte[])value));
|
||||
}
|
||||
else
|
||||
Headers = null;
|
||||
}
|
||||
|
||||
|
||||
public IBasicProperties ToBasicProperties()
|
||||
public IBasicProperties ToBasicProperties(IModel channel)
|
||||
{
|
||||
var properties = new BasicProperties();
|
||||
var properties = channel.CreateBasicProperties();
|
||||
|
||||
if (!string.IsNullOrEmpty(AppId)) properties.AppId = AppId;
|
||||
if (!string.IsNullOrEmpty(ClusterId)) properties.ClusterId = ClusterId;
|
||||
@ -228,8 +227,8 @@ namespace Tapeti.Cmd.Serialization
|
||||
{
|
||||
properties.Headers = new Dictionary<string, object>();
|
||||
|
||||
foreach (var pair in Headers)
|
||||
properties.Headers.Add(pair.Key, Encoding.UTF8.GetBytes(pair.Value));
|
||||
foreach (var (key, value) in Headers)
|
||||
properties.Headers.Add(key, Encoding.UTF8.GetBytes(value));
|
||||
}
|
||||
|
||||
return properties;
|
||||
|
@ -5,14 +5,19 @@
|
||||
<TargetFramework>netcoreapp2.1</TargetFramework>
|
||||
<Version>2.0.0</Version>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company>Mark van Renswoude</Company>
|
||||
<Company />
|
||||
<Description></Description>
|
||||
<PackageTags>rabbitmq tapeti</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<Version>2.0.0</Version>
|
||||
<Product>Tapeti Command-line Utility</Product>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CommandLineParser" Version="2.7.82" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
|
||||
<PackageReference Include="CommandLineParser" Version="2.8.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||
<PackageReference Include="RabbitMQ.Client" Version="6.2.1" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -3,6 +3,13 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>Additional DataAnnotations attributes. Not specific to Tapeti, but useful for annotating message classes.</Description>
|
||||
<PackageTags>rabbitmq tapeti dataannotations</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.DataAnnotations.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -11,7 +18,14 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.DataAnnotations.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,23 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.DataAnnotations.Extensions</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti DataAnnotations Extensions</title>
|
||||
<authors>Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.DataAnnotations.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Additional DataAnnotations attributes. Not specific to Tapeti, but useful for annotating message classes.</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti dataannotations</tags>
|
||||
<dependencies>
|
||||
<dependency id="System.ComponentModel.Annotations" version="4.5.0" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -3,6 +3,13 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>DataAnnotations validation extension for Tapeti</Description>
|
||||
<PackageTags>rabbitmq tapeti dataannotations</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.DataAnnotations.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -11,11 +18,18 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.DataAnnotations.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.DataAnnotations</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti DataAnnotations</title>
|
||||
<authors>Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.DataAnnotations.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>DataAnnotations validation extension for Tapeti</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti dataannotations</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti" version="[$version$]" />
|
||||
<dependency id="System.ComponentModel.Annotations" version="4.5.0" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -27,7 +27,8 @@ namespace Tapeti.Flow.SQL
|
||||
private readonly string tableName;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public SqlConnectionFlowRepository(string connectionString, string tableName = "Flow")
|
||||
{
|
||||
this.connectionString = connectionString;
|
||||
|
@ -1,7 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data.SqlClient;
|
||||
using System.Text;
|
||||
using System.Linq;
|
||||
|
||||
// ReSharper disable UnusedMember.Global
|
||||
|
||||
namespace Tapeti.Flow.SQL
|
||||
{
|
||||
@ -24,16 +26,8 @@ namespace Tapeti.Flow.SQL
|
||||
|
||||
case Exception exception:
|
||||
{
|
||||
var sqlExceptions = ExtractSqlExceptions(e);
|
||||
foreach (var sqlException in sqlExceptions)
|
||||
{
|
||||
var sqlErrors = UnwrapSqlErrors(sqlException);
|
||||
|
||||
if (IsRecoverableSQLError(sqlErrors))
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
var sqlExceptions = ExtractSqlExceptions(exception);
|
||||
return sqlExceptions.Select(UnwrapSqlErrors).Any(IsRecoverableSQLError);
|
||||
}
|
||||
|
||||
default:
|
||||
|
@ -3,6 +3,13 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>SQL backing repository for the Tapeti Flow package</Description>
|
||||
<PackageTags>rabbitmq tapeti flow sql</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.Flow.SQL.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -19,7 +26,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
|
||||
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@ -27,4 +34,11 @@
|
||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.Flow.SQL.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,25 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.Flow.SQL</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti Flow SQL</title>
|
||||
<authors>Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.Flow.SQL.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>SQL backing repository for the Tapeti Flow package</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti sql</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti" version="[$version$]" />
|
||||
<dependency id="Tapeti.Flow" version="[$version$]" />
|
||||
<dependency id="System.Data.SqlClient" version="4.5.0" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -63,7 +63,7 @@ namespace Tapeti.Flow.Default
|
||||
// Do not call when the controller method was filtered, if the same message has two methods
|
||||
return;
|
||||
|
||||
if (flowContext?.FlowStateLock != null)
|
||||
if (flowContext.FlowStateLock != null)
|
||||
{
|
||||
if (!flowContext.IsStoredOrDeleted())
|
||||
// The exception strategy can set the consume result to Success. Instead, check if the yield point
|
||||
|
@ -9,13 +9,15 @@ namespace Tapeti.Flow.Default
|
||||
/// </summary>
|
||||
internal class FlowHandlerContext : IFlowHandlerContext
|
||||
{
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public FlowHandlerContext()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public FlowHandlerContext(IControllerMessageContext source)
|
||||
{
|
||||
if (source == null)
|
||||
|
@ -22,7 +22,8 @@ namespace Tapeti.Flow.Default
|
||||
private readonly IInternalPublisher publisher;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public FlowProvider(ITapetiConfig config, IPublisher publisher)
|
||||
{
|
||||
this.config = config;
|
||||
|
@ -15,7 +15,8 @@ namespace Tapeti.Flow.Default
|
||||
private readonly ITapetiConfig config;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public FlowStarter(ITapetiConfig config)
|
||||
{
|
||||
this.config = config;
|
||||
|
@ -35,7 +35,8 @@ namespace Tapeti.Flow.Default
|
||||
private volatile bool loaded;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public FlowStore(IFlowRepository repository)
|
||||
{
|
||||
this.repository = repository;
|
||||
|
@ -12,7 +12,8 @@ namespace Tapeti.Flow
|
||||
{
|
||||
private readonly IFlowRepository flowRepository;
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public FlowExtension(IFlowRepository flowRepository)
|
||||
{
|
||||
this.flowRepository = flowRepository;
|
||||
|
@ -11,7 +11,8 @@ namespace Tapeti.Flow.FlowHelpers
|
||||
{
|
||||
private readonly Dictionary<T, LockItem> locks;
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public LockCollection(IEqualityComparer<T> comparer)
|
||||
{
|
||||
locks = new Dictionary<T, LockItem>(comparer);
|
||||
|
@ -3,6 +3,13 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Menno van Lavieren, Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description></Description>
|
||||
<PackageTags>rabbitmq tapeti flow</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.Flow.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -15,4 +22,11 @@
|
||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.Flow.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.Flow</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti Flow</title>
|
||||
<authors>Menno van Lavieren, Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.Flow.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Flow extension for Tapeti</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti flow</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti" version="[$version$]" />
|
||||
<dependency id="Tapeti.Annotations" version="[$version$]" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -13,7 +13,8 @@ namespace Tapeti.Ninject
|
||||
private readonly IKernel kernel;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public NinjectDependencyResolver(IKernel kernel)
|
||||
{
|
||||
this.kernel = kernel;
|
||||
|
@ -3,6 +3,13 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>Ninject integration package for Tapeti</Description>
|
||||
<PackageTags>rabbitmq tapeti ninject</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.SimpleInjector.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -14,4 +21,11 @@
|
||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.SimpleInjector.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.Ninject</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti Ninject</title>
|
||||
<authors>Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.SimpleInjector.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Ninject integration package for Tapeti</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti ninject</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti" version="[$version$]" />
|
||||
<dependency id="Ninject" version="3.3.4" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -3,6 +3,13 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Hans Mulder, Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>Serilog integration package for Tapeti</Description>
|
||||
<PackageTags>rabbitmq tapeti serilog</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.Serilog.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -11,11 +18,18 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Serilog" Version="2.9.0" />
|
||||
<PackageReference Include="Serilog" Version="2.10.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.Serilog.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.Serilog</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti Serilog</title>
|
||||
<authors>Hans Mulder</authors>
|
||||
<owners>Hans Mulder</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.Serilog.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Serilog integration package for Tapeti</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti serilog</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti" version="[$version$]" />
|
||||
<dependency id="Serilog" version="2.7.1" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -14,7 +14,8 @@ namespace Tapeti.SimpleInjector
|
||||
private readonly Lifestyle defaultsLifestyle;
|
||||
private readonly Lifestyle controllersLifestyle;
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public SimpleInjectorDependencyResolver(Container container, Lifestyle defaultsLifestyle = null, Lifestyle controllersLifestyle = null)
|
||||
{
|
||||
this.container = container;
|
||||
|
@ -3,6 +3,14 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>SimpleInjector integration package for Tapeti</Description>
|
||||
<PackageTags>rabbitmq tapeti simpleinjector</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.SimpleInjector.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -11,11 +19,18 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="SimpleInjector" Version="4.6.2" />
|
||||
<PackageReference Include="SimpleInjector" Version="5.3.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.SimpleInjector.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.SimpleInjector</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti SimpleInjector</title>
|
||||
<authors>Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.SimpleInjector.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>SimpleInjector integration package for Tapeti</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti simpleinjector</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti" version="[$version$]" />
|
||||
<dependency id="SimpleInjector" version="4.3.0" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -60,7 +60,8 @@ namespace Tapeti.Tests.Default
|
||||
AssertRoutingKey("acr.test.mixed.case", typeof(ACRTestMIXEDCaseMESSAGE));
|
||||
}
|
||||
|
||||
private void AssertRoutingKey(string expected, Type messageType)
|
||||
// ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
|
||||
private static void AssertRoutingKey(string expected, Type messageType)
|
||||
{
|
||||
if (expected == null) throw new ArgumentNullException(nameof(expected));
|
||||
if (messageType == null) throw new ArgumentNullException(nameof(messageType));
|
||||
|
@ -9,9 +9,9 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
|
||||
<PackageReference Include="xunit" Version="2.4.1" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
|
@ -3,6 +3,13 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Menno van Lavieren, Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>Transient extension for Tapeti Flow</Description>
|
||||
<PackageTags>rabbitmq tapeti flow transient</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.Flow.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
@ -14,4 +21,11 @@
|
||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.Flow.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,23 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.Transient</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti Transient</title>
|
||||
<authors>Menno van Lavieren, Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.Flow.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Transient extension for Tapeti</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti transient</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti" version="[$version$]" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -11,7 +11,8 @@ namespace Tapeti.Transient
|
||||
private readonly TransientRouter router;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public TransientExtension(TimeSpan defaultTimeout, string dynamicQueuePrefix)
|
||||
{
|
||||
this.dynamicQueuePrefix = dynamicQueuePrefix;
|
||||
|
@ -21,7 +21,8 @@ namespace Tapeti.Transient
|
||||
public QueueType QueueType => QueueType.Dynamic;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public TransientGenericBinding(TransientRouter router, string dynamicQueuePrefix)
|
||||
{
|
||||
this.router = router;
|
||||
|
@ -12,7 +12,8 @@ namespace Tapeti.Transient
|
||||
private readonly IPublisher publisher;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public TransientPublisher(TransientRouter router, IPublisher publisher)
|
||||
{
|
||||
this.router = router;
|
||||
|
@ -21,7 +21,8 @@ namespace Tapeti.Transient
|
||||
public string TransientResponseQueueName { get; set; }
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public TransientRouter(TimeSpan defaultTimeout)
|
||||
{
|
||||
defaultTimeoutMs = (int)defaultTimeout.TotalMilliseconds;
|
||||
|
@ -3,15 +3,29 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>Unity container integration package for Tapeti</Description>
|
||||
<PackageTags>rabbitmq tapeti unity</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.SimpleInjector.png</PackageIcon>
|
||||
<Version>2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Unity" Version="5.11.1" />
|
||||
<PackageReference Include="Unity" Version="5.11.10" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Tapeti\Tapeti.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.SimpleInjector.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti.UnityContainer</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti UnityContainer</title>
|
||||
<authors>Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.SimpleInjector.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Unity container integration package for Tapeti</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti unity</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti" version="[$version$]" />
|
||||
<dependency id="Unity" version="5.11.1" />
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -13,7 +13,8 @@ namespace Tapeti.UnityContainer
|
||||
private readonly IUnityContainer container;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public UnityDependencyResolver(IUnityContainer container)
|
||||
{
|
||||
this.container = container;
|
||||
|
@ -1,5 +1,4 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Tapeti.Config
|
||||
|
@ -1,6 +1,7 @@
|
||||
using System;
|
||||
|
||||
// ReSharper disable UnusedMember.Global
|
||||
// ReSharper disable UnusedMemberInSuper.Global
|
||||
|
||||
namespace Tapeti.Config
|
||||
{
|
||||
|
@ -1,4 +1,5 @@
|
||||
// ReSharper disable UnusedMember.Global
|
||||
// ReSharper disable UnusedMemberInSuper.Global
|
||||
|
||||
namespace Tapeti.Config
|
||||
{
|
||||
|
@ -10,7 +10,7 @@ namespace Tapeti.Connection
|
||||
/// <summary>
|
||||
/// Defines a queue binding to an exchange using a routing key
|
||||
/// </summary>
|
||||
public struct QueueBinding : IEquatable<QueueBinding>
|
||||
public readonly struct QueueBinding : IEquatable<QueueBinding>
|
||||
{
|
||||
/// <summary></summary>
|
||||
public readonly string Exchange;
|
||||
|
@ -24,13 +24,19 @@ namespace Tapeti.Connection
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, IBasicProperties properties, byte[] body)
|
||||
public override void HandleBasicDeliver(string consumerTag,
|
||||
ulong deliveryTag,
|
||||
bool redelivered,
|
||||
string exchange,
|
||||
string routingKey,
|
||||
IBasicProperties properties,
|
||||
ReadOnlyMemory<byte> body)
|
||||
{
|
||||
Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
var response = await consumer.Consume(exchange, routingKey, new RabbitMQMessageProperties(properties), body);
|
||||
var response = await consumer.Consume(exchange, routingKey, new RabbitMQMessageProperties(properties), body.ToArray());
|
||||
await onRespond(deliveryTag, response);
|
||||
}
|
||||
catch
|
||||
|
@ -351,7 +351,7 @@ namespace Tapeti.Connection
|
||||
}
|
||||
catch (OperationInterruptedException e)
|
||||
{
|
||||
if (e.ShutdownReason.ReplyCode == RabbitMQ.Client.Framing.Constants.PreconditionFailed)
|
||||
if (e.ShutdownReason.ReplyCode == Constants.PreconditionFailed)
|
||||
retry = true;
|
||||
else
|
||||
throw;
|
||||
@ -519,9 +519,10 @@ namespace Tapeti.Connection
|
||||
var bindings = JsonConvert.DeserializeObject<IEnumerable<ManagementBinding>>(content);
|
||||
|
||||
// Filter out the binding to an empty source, which is always present for direct-to-queue routing
|
||||
return bindings
|
||||
return bindings?
|
||||
.Where(binding => !string.IsNullOrEmpty(binding.Source))
|
||||
.Select(binding => new QueueBinding(binding.Source, binding.RoutingKey));
|
||||
.Select(binding => new QueueBinding(binding.Source, binding.RoutingKey))
|
||||
?? Enumerable.Empty<QueueBinding>();
|
||||
});
|
||||
}
|
||||
|
||||
@ -655,7 +656,7 @@ namespace Tapeti.Connection
|
||||
Password = connectionParams.Password,
|
||||
AutomaticRecoveryEnabled = false,
|
||||
TopologyRecoveryEnabled = false,
|
||||
RequestedHeartbeat = 30
|
||||
RequestedHeartbeat = TimeSpan.FromSeconds(30)
|
||||
};
|
||||
|
||||
if (connectionParams.ClientProperties != null)
|
||||
|
@ -18,7 +18,6 @@ namespace Tapeti.Connection
|
||||
private CancellationTokenSource initializeCancellationTokenSource;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
public TapetiSubscriber(Func<ITapetiClient> clientFactory, ITapetiConfig config)
|
||||
{
|
||||
this.clientFactory = clientFactory;
|
||||
|
@ -118,7 +118,10 @@ namespace Tapeti.Default
|
||||
public bool HasBinding => Binding != null;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// Creates a new default implementation for IBindingParameter
|
||||
/// </summary>
|
||||
/// <param name="info"></param>
|
||||
public ControllerBindingParameter(ParameterInfo info)
|
||||
{
|
||||
Info = info;
|
||||
@ -155,6 +158,10 @@ namespace Tapeti.Default
|
||||
public bool HasHandler => Handler != null;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Creates a new default implementation for IBindingResult
|
||||
/// </summary>
|
||||
/// <param name="info"></param>
|
||||
public ControllerBindingResult(ParameterInfo info)
|
||||
{
|
||||
Info = info;
|
||||
|
@ -32,7 +32,6 @@ namespace Tapeti.Default
|
||||
IControllerMethodBinding IControllerMessageContext.Binding => decoratedContext.Binding as IControllerMethodBinding;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
public ControllerMessageContext(IMessageContext decoratedContext)
|
||||
{
|
||||
this.decoratedContext = decoratedContext;
|
||||
|
@ -18,7 +18,6 @@ namespace Tapeti.Default
|
||||
public Exception Exception { get; }
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
public ExceptionStrategyContext(IMessageContext messageContext, Exception exception)
|
||||
{
|
||||
MessageContext = messageContext;
|
||||
|
@ -60,7 +60,7 @@ namespace Tapeti.Default
|
||||
if (reader.TokenType != JsonToken.String)
|
||||
throw new JsonSerializationException($"Unexpected token {reader.TokenType} when parsing enum");
|
||||
|
||||
var enumText = reader.Value.ToString();
|
||||
var enumText = reader.Value?.ToString() ?? "";
|
||||
if (enumText == string.Empty && isNullable)
|
||||
return null;
|
||||
|
||||
|
@ -21,7 +21,8 @@ namespace Tapeti.Default
|
||||
private readonly JsonSerializerSettings serializerSettings;
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public JsonMessageSerializer()
|
||||
{
|
||||
serializerSettings = new JsonSerializerSettings
|
||||
|
@ -29,13 +29,15 @@ namespace Tapeti.Default
|
||||
public DateTime? Timestamp { get; set; }
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public MessageProperties()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public MessageProperties(IMessageProperties source)
|
||||
{
|
||||
if (source == null)
|
||||
|
@ -30,6 +30,7 @@ namespace Tapeti.Default
|
||||
|
||||
// Verify the return type matches with the Request attribute of the message class. This is a backwards incompatible change in
|
||||
// Tapeti 1.2: if you just want to publish another message as a result of the incoming message, explicitly call IPublisher.Publish.
|
||||
// ReSharper disable once ConvertIfStatementToSwitchStatement
|
||||
if (!hasClassResult && expectedClassResult != null || hasClassResult && expectedClassResult != actualType)
|
||||
throw new ArgumentException($"Message handler must return type {expectedClassResult?.FullName ?? "void"} in controller {context.Method.DeclaringType?.FullName}, method {context.Method.Name}, found: {actualType?.FullName ?? "void"}");
|
||||
|
||||
|
@ -56,14 +56,16 @@ namespace Tapeti.Default
|
||||
}
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public RabbitMQMessageProperties(IBasicProperties basicProperties)
|
||||
{
|
||||
BasicProperties = basicProperties;
|
||||
}
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public RabbitMQMessageProperties(IBasicProperties basicProperties, IMessageProperties source)
|
||||
{
|
||||
BasicProperties = basicProperties;
|
||||
|
@ -2,6 +2,7 @@
|
||||
using System.Threading.Tasks;
|
||||
|
||||
// ReSharper disable UnusedMember.Global
|
||||
// ReSharper disable UnusedMemberInSuper.Global
|
||||
|
||||
namespace Tapeti
|
||||
{
|
||||
|
@ -2,6 +2,7 @@
|
||||
using Tapeti.Config;
|
||||
|
||||
// ReSharper disable UnusedMember.Global
|
||||
// ReSharper disable UnusedMemberInSuper.Global
|
||||
|
||||
namespace Tapeti
|
||||
{
|
||||
|
@ -3,7 +3,7 @@ using System.Linq.Expressions;
|
||||
using System.Threading.Tasks;
|
||||
using Tapeti.Config;
|
||||
|
||||
// ReSharper disable once UnusedMember.Global
|
||||
// ReSharper disable UnusedMember.Global
|
||||
|
||||
namespace Tapeti
|
||||
{
|
||||
|
@ -1,6 +1,8 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
// ReSharper disable UnusedMember.Global
|
||||
|
||||
namespace Tapeti
|
||||
{
|
||||
/// <inheritdoc />
|
||||
|
@ -4,6 +4,13 @@
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<Version>2.0.0</Version>
|
||||
<Authors>Mark van Renswoude</Authors>
|
||||
<Company />
|
||||
<Description>Controller-based framework for RabbitMQ microservice architectures</Description>
|
||||
<PackageTags>rabbitmq tapeti</PackageTags>
|
||||
<PackageLicenseExpression>Unlicense</PackageLicenseExpression>
|
||||
<PackageProjectUrl>https://github.com/MvRens/Tapeti</PackageProjectUrl>
|
||||
<PackageIcon>Tapeti.png</PackageIcon>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
@ -11,13 +18,20 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
|
||||
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||
<PackageReference Include="RabbitMQ.Client" Version="6.2.1" />
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Tapeti.Annotations\Tapeti.Annotations.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\resources\icons\Tapeti.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@ -1,26 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<package >
|
||||
<metadata>
|
||||
<id>Tapeti</id>
|
||||
<version>$version$</version>
|
||||
<title>Tapeti</title>
|
||||
<authors>Mark van Renswoude</authors>
|
||||
<owners>Mark van Renswoude</owners>
|
||||
<license type="expression">Unlicense</license>
|
||||
<projectUrl>https://github.com/MvRens/Tapeti</projectUrl>
|
||||
<iconUrl>https://raw.githubusercontent.com/MvRens/Tapeti/master/resources/icons/Tapeti.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Controller-based framework for RabbitMQ microservice architectures</description>
|
||||
<copyright></copyright>
|
||||
<tags>rabbitmq tapeti</tags>
|
||||
<dependencies>
|
||||
<dependency id="Tapeti.Annotations" version="[$version$]" />
|
||||
<dependency id="Newtonsoft.Json" version="12.0.2"/>
|
||||
<dependency id="RabbitMQ.Client" version="5.0.1"/>
|
||||
<dependency id="System.Configuration.ConfigurationManager" version="4.5.0"/>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="bin\Release\**" target="lib" />
|
||||
</files>
|
||||
</package>
|
@ -1,6 +1,8 @@
|
||||
using System.Configuration;
|
||||
using System.Linq;
|
||||
|
||||
// ReSharper disable UnusedMember.Global
|
||||
|
||||
namespace Tapeti
|
||||
{
|
||||
/// <inheritdoc />
|
||||
@ -23,6 +25,7 @@ namespace Tapeti
|
||||
public class TapetiAppSettingsConnectionParams : TapetiConnectionParams
|
||||
{
|
||||
private const string DefaultPrefix = "rabbitmq:";
|
||||
// ReSharper disable InconsistentNaming
|
||||
private const string KeyHostname = "hostname";
|
||||
private const string KeyPort = "port";
|
||||
private const string KeyVirtualHost = "virtualhost";
|
||||
@ -31,9 +34,10 @@ namespace Tapeti
|
||||
private const string KeyPrefetchCount = "prefetchcount";
|
||||
private const string KeyManagementPort = "managementport";
|
||||
private const string KeyClientProperty = "clientproperty:";
|
||||
// ReSharper restore InconsistentNaming
|
||||
|
||||
|
||||
private struct AppSettingsKey
|
||||
private readonly struct AppSettingsKey
|
||||
{
|
||||
public readonly string Entry;
|
||||
public readonly string Parameter;
|
||||
|
@ -65,7 +65,8 @@ namespace Tapeti
|
||||
}
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
/// <summary>
|
||||
/// </summary>
|
||||
public TapetiConnectionParams()
|
||||
{
|
||||
}
|
||||
|
55
appveyor.yml
55
appveyor.yml
@ -1,4 +1,4 @@
|
||||
image: Visual Studio 2017
|
||||
image: Visual Studio 2019
|
||||
|
||||
|
||||
install:
|
||||
@ -11,45 +11,44 @@ before_build:
|
||||
|
||||
after_build:
|
||||
# Tapeti
|
||||
- cmd: ECHO nuget pack Tapeti\Tapeti.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: nuget pack Tapeti\Tapeti.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti\Tapeti.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.Annotations
|
||||
- cmd: nuget pack Tapeti.Annotations\Tapeti.Annotations.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.Annotations.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.Annotations\Tapeti.Annotations.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.Annotations.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.DataAnnotations
|
||||
- cmd: nuget pack Tapeti.DataAnnotations\Tapeti.DataAnnotations.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.DataAnnotations.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.DataAnnotations\Tapeti.DataAnnotations.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.DataAnnotations.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.DataAnnotations.Extensions
|
||||
- cmd: nuget pack Tapeti.DataAnnotations.Extensions\Tapeti.DataAnnotations.Extensions.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.DataAnnotations.Extensions.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.DataAnnotations.Extensions\Tapeti.DataAnnotations.Extensions.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.DataAnnotations.Extensions.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.Flow
|
||||
- cmd: nuget pack Tapeti.Flow\Tapeti.Flow.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.Flow.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.Flow\Tapeti.Flow.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.Flow.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.Flow.SQL
|
||||
- cmd: nuget pack Tapeti.Flow.SQL\Tapeti.Flow.SQL.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.Flow.SQL.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.Flow.SQL\Tapeti.Flow.SQL.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.Flow.SQL.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.Transient
|
||||
- cmd: nuget pack Tapeti.Transient\Tapeti.Transient.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.Transient.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.Transient\Tapeti.Transient.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.Transient.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.Serilog
|
||||
- cmd: nuget pack Tapeti.Serilog\Tapeti.Serilog.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.Serilog.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.Serilog\Tapeti.Serilog.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.Serilog.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.SimpleInjector
|
||||
- cmd: nuget pack Tapeti.SimpleInjector\Tapeti.SimpleInjector.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.SimpleInjector.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.SimpleInjector.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.Autofac
|
||||
- cmd: nuget pack Tapeti.Autofac\Tapeti.Autofac.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.Autofac.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.Autofac\Tapeti.Autofac.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.Autofac.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.CastleWindsor
|
||||
- cmd: nuget pack Tapeti.CastleWindsor\Tapeti.CastleWindsor.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.CastleWindsor.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.CastleWindsor\Tapeti.CastleWindsor.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.CastleWindsor.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.Ninject
|
||||
- cmd: nuget pack Tapeti.Ninject\Tapeti.Ninject.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.Ninject.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.Ninject\Tapeti.Ninject.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.Ninject.%GitVersion_NuGetVersion%.nupkg"
|
||||
# Tapeti.UnityContainer
|
||||
- cmd: nuget pack Tapeti.UnityContainer\Tapeti.UnityContainer.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
|
||||
- cmd: appveyor PushArtifact "Tapeti.UnityContainer.%GitVersion_NuGetVersion%.nupkg"
|
||||
- cmd: dotnet pack --output output Tapeti.UnityContainer\Tapeti.UnityContainer.csproj /p:Configuration=Release /p:Version=%GitVersion_NuGetVersion%
|
||||
- cmd: appveyor PushArtifact "output\Tapeti.UnityContainer.%GitVersion_NuGetVersion%.nupkg"
|
||||
|
||||
build:
|
||||
project: Tapeti.sln
|
||||
|
Loading…
Reference in New Issue
Block a user