Merge pull request #64 from lukeabsent/AMQNET-637
AMQNET-637 Async message factory method overloads for producers and merge outstanding changes
diff --git a/.travis.yml b/.travis.yml
index 1c04b32..7027cec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: csharp
solution: apache-nms-amqp.sln
mono: none
-dotnet: 2.2.401
+dotnet: 2.1
script:
- - dotnet build -p:AppTargetFramework=netcoreapp2.2 -c Release
- - dotnet test ./test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj -f netcoreapp2.2 -c Release --filter Category!=Windows
\ No newline at end of file
+ - dotnet build -p:AppTargetFramework=netcoreapp2.1 -c Release
+ - dotnet test ./test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj -f netcoreapp2.1 -c Release --filter Category!=Windows
\ No newline at end of file
diff --git a/package.ps1 b/package.ps1
index 991752a..d1382c5 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
# limitations under the License.
$pkgname = "Apache.NMS.AMQP"
-$pkgver = "1.8.2"
+$pkgver = "2.0.0"
$frameworks = "netstandard2.0"
write-progress "Creating package directory." "Initializing..."
diff --git a/src/HelloWorld/HelloWorld.csproj b/src/HelloWorld/HelloWorld.csproj
index 3e156c1..14b17d0 100644
--- a/src/HelloWorld/HelloWorld.csproj
+++ b/src/HelloWorld/HelloWorld.csproj
@@ -17,7 +17,7 @@
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net462;netcoreapp2.2</TargetFrameworks>
+ <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
<TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>HelloWorld</RootNamespace>
diff --git a/src/NMS.AMQP/Apache-NMS-AMQP.csproj b/src/NMS.AMQP/Apache-NMS-AMQP.csproj
index b710bc1..7f08a9b 100644
--- a/src/NMS.AMQP/Apache-NMS-AMQP.csproj
+++ b/src/NMS.AMQP/Apache-NMS-AMQP.csproj
@@ -33,7 +33,7 @@
<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageId>Apache.NMS.AMQP</PackageId>
- <Version>1.8.2</Version>
+ <Version>2.0.0</Version>
<Authors>Apache ActiveMQ</Authors>
<Company>Apache Software Foundation</Company>
<Product>Apache ActiveMQ NMS AMQP Client</Product>
diff --git a/src/NMS.AMQP/NmsMessageProducer.cs b/src/NMS.AMQP/NmsMessageProducer.cs
index e215861..f3fd06e 100644
--- a/src/NMS.AMQP/NmsMessageProducer.cs
+++ b/src/NMS.AMQP/NmsMessageProducer.cs
@@ -135,48 +135,96 @@
return session.CreateMessage();
}
+ public async Task<IMessage> CreateMessageAsync()
+ {
+ CheckClosed();
+ return await session.CreateMessageAsync();
+ }
+
public ITextMessage CreateTextMessage()
{
CheckClosed();
return session.CreateTextMessage();
}
+ public async Task<ITextMessage> CreateTextMessageAsync()
+ {
+ CheckClosed();
+ return await session.CreateTextMessageAsync();
+ }
+
public ITextMessage CreateTextMessage(string text)
{
CheckClosed();
return session.CreateTextMessage(text);
}
+ public async Task<ITextMessage> CreateTextMessageAsync(string text)
+ {
+ CheckClosed();
+ return await session.CreateTextMessageAsync(text);
+ }
+
public IMapMessage CreateMapMessage()
{
CheckClosed();
return session.CreateMapMessage();
}
+ public async Task<IMapMessage> CreateMapMessageAsync()
+ {
+ CheckClosed();
+ return await session.CreateMapMessageAsync();
+ }
+
public IObjectMessage CreateObjectMessage(object body)
{
CheckClosed();
return session.CreateObjectMessage(body);
}
+ public async Task<IObjectMessage> CreateObjectMessageAsync(object body)
+ {
+ CheckClosed();
+ return await session.CreateObjectMessageAsync(body);
+ }
+
public IBytesMessage CreateBytesMessage()
{
CheckClosed();
return session.CreateBytesMessage();
}
+ public async Task<IBytesMessage> CreateBytesMessageAsync()
+ {
+ CheckClosed();
+ return await session.CreateBytesMessageAsync();
+ }
+
public IBytesMessage CreateBytesMessage(byte[] body)
{
CheckClosed();
return session.CreateBytesMessage(body);
}
+ public async Task<IBytesMessage> CreateBytesMessageAsync(byte[] body)
+ {
+ CheckClosed();
+ return await session.CreateBytesMessageAsync(body);
+ }
+
public IStreamMessage CreateStreamMessage()
{
CheckClosed();
return session.CreateStreamMessage();
}
+ public async Task<IStreamMessage> CreateStreamMessageAsync()
+ {
+ CheckClosed();
+ return await session.CreateStreamMessageAsync();
+ }
+
public ProducerTransformerDelegate ProducerTransformer { get; set; }
public MsgDeliveryMode DeliveryMode
diff --git a/src/NMS.AMQP/NmsProducer.cs b/src/NMS.AMQP/NmsProducer.cs
index fad1a2c..c095e69 100644
--- a/src/NMS.AMQP/NmsProducer.cs
+++ b/src/NMS.AMQP/NmsProducer.cs
@@ -161,41 +161,81 @@
return session.CreateMessage();
}
+ public Task<IMessage> CreateMessageAsync()
+ {
+ return session.CreateMessageAsync();
+ }
+
public ITextMessage CreateTextMessage()
{
return session.CreateTextMessage();
}
+ public Task<ITextMessage> CreateTextMessageAsync()
+ {
+ return session.CreateTextMessageAsync();
+ }
+
public ITextMessage CreateTextMessage(string text)
{
return session.CreateTextMessage(text);
}
+ public Task<ITextMessage> CreateTextMessageAsync(string text)
+ {
+ return session.CreateTextMessageAsync(text);
+ }
+
public IMapMessage CreateMapMessage()
{
return session.CreateMapMessage();
}
+ public Task<IMapMessage> CreateMapMessageAsync()
+ {
+ return session.CreateMapMessageAsync();
+ }
+
public IObjectMessage CreateObjectMessage(object body)
{
return session.CreateObjectMessage(body);
}
+ public Task<IObjectMessage> CreateObjectMessageAsync(object body)
+ {
+ return session.CreateObjectMessageAsync(body);
+ }
+
public IBytesMessage CreateBytesMessage()
{
return session.CreateBytesMessage();
}
+ public Task<IBytesMessage> CreateBytesMessageAsync()
+ {
+ return session.CreateBytesMessageAsync();
+ }
+
public IBytesMessage CreateBytesMessage(byte[] body)
{
return session.CreateBytesMessage(body);
}
+ public Task<IBytesMessage> CreateBytesMessageAsync(byte[] body)
+ {
+ return session.CreateBytesMessageAsync(body);
+ }
+
public IStreamMessage CreateStreamMessage()
{
return session.CreateStreamMessage();
}
+ public Task<IStreamMessage> CreateStreamMessageAsync()
+ {
+ return session.CreateStreamMessageAsync();
+ }
+
public void Close()
{
producer.Close();
diff --git a/src/PingPong/PingPong.csproj b/src/PingPong/PingPong.csproj
index 1e3ab20..38b0af5 100644
--- a/src/PingPong/PingPong.csproj
+++ b/src/PingPong/PingPong.csproj
@@ -18,7 +18,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp2.2</TargetFramework>
+ <TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/src/StructuredMessage/StructuredMessage.csproj b/src/StructuredMessage/StructuredMessage.csproj
index c7c0500..ea92a54 100644
--- a/src/StructuredMessage/StructuredMessage.csproj
+++ b/src/StructuredMessage/StructuredMessage.csproj
@@ -17,7 +17,7 @@
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net462;netcoreapp2.2</TargetFrameworks>
+ <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
<TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>StructuredMessage</RootNamespace>
diff --git a/src/Transactions/Transactions.csproj b/src/Transactions/Transactions.csproj
index 51f9be8..68b90ff 100644
--- a/src/Transactions/Transactions.csproj
+++ b/src/Transactions/Transactions.csproj
@@ -18,7 +18,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp2.2</TargetFramework>
+ <TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework>
</PropertyGroup>
diff --git a/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj b/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj
index abbd2fc..07a722b 100644
--- a/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj
+++ b/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj
@@ -16,7 +16,7 @@
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+ <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
<TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework>
<RootNamespace>NMS.AMQP.Test</RootNamespace>
<AssemblyName>NMS.AMQP.Interop.Test</AssemblyName>
diff --git a/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj b/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj
index 2de2f86..5452060 100644
--- a/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj
+++ b/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj
@@ -16,7 +16,7 @@
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+ <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
<TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework>
<RootNamespace>NMS.AMQP.Test</RootNamespace>
<AssemblyName>NMS.AMQP.Test</AssemblyName>
