You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by mi...@apache.org on 2021/03/23 18:22:44 UTC
[activemq-nms-amqp] branch master updated (f496e41 -> 2ea3ea2)
This is an automated email from the ASF dual-hosted git repository.
michaelpearce pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-nms-amqp.git.
from f496e41 Merge pull request #63 from brudo/lts-revert-netcore21
add 4c9c737 AMQNET-637 NMS 2.0 - Add NMS 2.0 method implementations.
add c5600c9 AMQNET-637 Implement async send for AmqpProducer
add e4efff2 AMQNET-637 Remove CompletionListener in favour of Task based Async, as well complete some left over bits on shared subscriptions and subscription tracking.
add 444a58e AMQNET-637 Handle async send timeout properly
add 7036101 AMQNET-637 More tests, fixes, logging, upgrades
add f973849 AMQNET-637 Class name
add 1682dc3 AMQNET-637 Deliverytime
add 62f26c0 AMQNET-637 More async methods implementations, refactors and increase AMQPNetLite.Core version
add 7780969 AMQNET-637 Move LangVersion back to 7.3 in interop test
add 672406b AMQNET-637 Implementation of async message factory methods for producers
add 984d469 AMQNET-637 Update version
add b51ddc9 AMQNET-637 Merge outstanding changes from apache master - with conflicts
add d46dac8 Merge pull request #3 from lukeabsent/AMQNET-637
add de7a207 Merge pull request #60 from michaelandrepearce/AMQNET-637
add a2a9d8b Merge pull request #61 from lukeabsent/AMQNET-637
add 562407f Merge pull request #62 from lukeabsent/AMQNET-637
add c4e3d2c Merge branch '2.0.x' of https://github.com/apache/activemq-nms-amqp into AMQNET-637
add c9b3715 Merge pull request #64 from lukeabsent/AMQNET-637
add 007df90 AMQNET-637 Allow closing on error handler, Await()
add 86359c7 Merge pull request #65 from lukeabsent/AMQNET-637
new 2ea3ea2 Merge pull request #66 from apache/2.0.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 8 +-
package.ps1 | 2 +-
src/NMS.AMQP/Apache-NMS-AMQP.csproj | 6 +-
src/NMS.AMQP/INmsTransactionContext.cs | 1 -
src/NMS.AMQP/Message/Facade/INmsMessageFacade.cs | 3 +
.../Message/Facade/INmsObjectMessageFacade.cs | 2 +-
src/NMS.AMQP/Message/NmsBytesMessage.cs | 14 +
src/NMS.AMQP/Message/NmsMapMessage.cs | 14 +
src/NMS.AMQP/Message/NmsMessage.cs | 39 +-
src/NMS.AMQP/Message/NmsMessageTransformation.cs | 9 +-
src/NMS.AMQP/Message/NmsObjectMessage.cs | 23 +-
src/NMS.AMQP/Message/NmsStreamMessage.cs | 6 +
src/NMS.AMQP/Message/NmsTextMessage.cs | 12 +
src/NMS.AMQP/Message/OutboundMessageDispatch.cs | 2 +-
src/NMS.AMQP/Meta/NmsConnectionInfo.cs | 6 +
src/NMS.AMQP/Meta/NmsConsumerInfo.cs | 2 +
src/NMS.AMQP/NmsAcknowledgeCallback.cs | 8 +-
src/NMS.AMQP/NmsConnection.cs | 113 +++-
src/NMS.AMQP/NmsConnectionFactory.cs | 54 +-
src/NMS.AMQP/NmsConsumer.cs | 113 ++++
src/NMS.AMQP/NmsContext.cs | 531 +++++++++++++++
...cSubscriber.cs => NmsDurableMessageConsumer.cs} | 9 +-
src/NMS.AMQP/NmsLocalTransactionContext.cs | 21 +-
src/NMS.AMQP/NmsMessageConsumer.cs | 266 ++++++--
src/NMS.AMQP/NmsMessageProducer.cs | 109 +++-
src/NMS.AMQP/NmsNoTxTransactionContext.cs | 1 -
src/NMS.AMQP/NmsProducer.cs | 446 +++++++++++++
src/NMS.AMQP/NmsQueueBrowser.cs | 183 ++++++
src/NMS.AMQP/NmsSession.cs | 346 ++++++++--
...riber.cs => NmsSharedDurableMessageConsumer.cs} | 9 +-
...icSubscriber.cs => NmsSharedMessageConsumer.cs} | 11 +-
src/NMS.AMQP/NmsTemporaryDestination.cs | 10 +-
src/NMS.AMQP/Provider/Amqp/AmqpConnection.cs | 56 +-
.../Provider/Amqp/AmqpConnectionSession.cs | 5 +-
src/NMS.AMQP/Provider/Amqp/AmqpConsumer.cs | 113 +++-
src/NMS.AMQP/Provider/Amqp/AmqpProducer.cs | 84 ++-
src/NMS.AMQP/Provider/Amqp/AmqpProvider.cs | 33 +-
src/NMS.AMQP/Provider/Amqp/AmqpSendTask.cs | 3 +-
src/NMS.AMQP/Provider/Amqp/AmqpSession.cs | 11 +-
.../Provider/Amqp/AmqpSubscriptionTracker.cs | 327 ++++++++++
.../Provider/Amqp/AmqpTemporaryDestination.cs | 7 +-
.../Provider/Amqp/AmqpTransactionContext.cs | 12 +-
.../Provider/Amqp/AmqpTransactionCoordinator.cs | 5 +-
.../Amqp/Message/AmqpNmsBytesMessageFacade.cs | 2 +-
.../Amqp/Message/AmqpNmsMapMessageFacade.cs | 2 +-
.../Provider/Amqp/Message/AmqpNmsMessageFacade.cs | 49 +-
.../Amqp/Message/AmqpNmsObjectMessageFacade.cs | 9 +-
.../Amqp/Message/AmqpNmsStreamMessageFacade.cs | 2 +-
.../Amqp/Message/AmqpNmsTextMessageFacade.cs | 2 +-
src/NMS.AMQP/Provider/Failover/FailoverProvider.cs | 50 +-
src/NMS.AMQP/Provider/Failover/FailoverRequest.cs | 3 +-
src/NMS.AMQP/Provider/IProvider.cs | 1 +
src/NMS.AMQP/SessionDispatcher.cs | 37 +-
src/NMS.AMQP/Util/AtomicLong.cs | 10 +
src/NMS.AMQP/Util/PriorityMessageQueue.cs | 73 ++-
src/NMS.AMQP/Util/SymbolUtil.cs | 25 +-
.../Synchronization/NmsSynchronizationMonitor.cs | 280 ++++++++
.../Util/Synchronization/TaskExtensions.cs | 66 ++
.../Synchronization/TaskSynchronizationSettings.cs | 38 ++
.../Util/Types/Map/AMQP/AMQPPrimitiveMap.cs | 4 +-
src/NMS.AMQP/Util/Types/Map/AMQP/AMQPValueMap.cs | 4 +-
src/NMS.AMQP/Util/Types/Map/PrimitiveMapBase.cs | 56 +-
src/NMS.AMQP/Util/UriUtil.cs | 5 -
.../AmqpTestSupport.cs | 31 +-
.../Apache-NMS-AMQP-Interop-Test.csproj | 7 +
.../NLog.config | 2 +-
.../NmsMessageConsumerTest.cs | 246 ++++++-
.../NmsMessageProducerTest.cs | 77 +++
.../Transactions/NmsTransactedConsumerTest.cs | 2 +
.../AmqpAcknowledgmentsIntegrationTest.cs | 1 +
.../AmqpAcknowledgmentsIntegrationTest.cs | 123 ++--
.../{ => Async}/ConnectionIntegrationTest.cs | 91 +--
.../{ => Async}/ConsumerIntegrationTest.cs | 360 +++++------
.../{ => Async}/FailoverIntegrationTest.cs | 290 ++++-----
.../Integration/Async/MessageDeliveryTimeTest.cs | 182 ++++++
.../MessageExpirationIntegrationTest.cs | 501 +++++++--------
.../NMSConsumerIntegrationTest.cs} | 687 ++++++++++----------
.../Integration/Async/NMSContextIntegrationTest.cs | 279 ++++++++
.../NMSProducerIntegrationTest.cs} | 494 +++++++-------
.../Async/ProducerIntegrationAsyncTest.cs | 135 ++++
.../{ => Async}/ProducerIntegrationTest.cs | 357 +++++------
.../Integration/Async/SessionIntegrationTest.cs | 289 +++++++++
.../{ => Async}/SubscriptionsIntegrationTest.cs | 23 +-
.../{ => Async}/TemporaryQueueIntegrationTest.cs | 39 +-
.../{ => Async}/TemporaryTopicIntegrationTest.cs | 39 +-
.../{ => Async}/TransactionsIntegrationTest.cs | 470 +++++++-------
.../Integration/ConsumerIntegrationTest.cs | 2 +
.../Integration/IntegrationTestFixture.cs | 43 +-
.../Integration/MessageDeliveryTimeTest.cs | 181 ++++++
...rationTest.cs => NMSConsumerIntegrationTest.cs} | 709 ++++++++++++---------
...grationTest.cs => NMSContextIntegrationTest.cs} | 201 +++---
...rationTest.cs => NMSProducerIntegrationTest.cs} | 439 ++++++-------
.../Integration/ProducerIntegrationAsyncTest.cs | 135 ++++
.../Integration/SessionIntegrationTest.cs | 57 ++
.../Message/Facade/AmqpNmsMessageFacadeTest.cs | 29 +
.../Message/Facade/NmsTestMessageFacade.cs | 6 +
.../Message/Facade/NmsTestObjectMessageFacade.cs | 4 +-
.../Message/Foreign/ForeignNmsMessage.cs | 22 +
.../Message/NmsObjectMessageTest.cs | 8 +-
.../Provider/Amqp/AmqpMessageFactoryTest.cs | 6 +-
.../Amqp/AmqpNmsObjectMessageFacadeTest.cs | 34 +-
.../Provider/Mock/MockProvider.cs | 5 +
test/Apache-NMS-AMQP-Test/TestAmqp/NLogAdapter.cs | 2 +-
test/Apache-NMS-AMQP-Test/TestAmqp/TestAmqpPeer.cs | 44 ++
.../TestAmqp/TestAmqpPeerRunner.cs | 8 +-
.../NmsSynchronizationMonitorTest.cs | 437 +++++++++++++
106 files changed, 8043 insertions(+), 2807 deletions(-)
create mode 100644 src/NMS.AMQP/NmsConsumer.cs
create mode 100644 src/NMS.AMQP/NmsContext.cs
copy src/NMS.AMQP/{NmsDurableTopicSubscriber.cs => NmsDurableMessageConsumer.cs} (82%)
create mode 100644 src/NMS.AMQP/NmsProducer.cs
create mode 100644 src/NMS.AMQP/NmsQueueBrowser.cs
copy src/NMS.AMQP/{NmsDurableTopicSubscriber.cs => NmsSharedDurableMessageConsumer.cs} (62%)
rename src/NMS.AMQP/{NmsDurableTopicSubscriber.cs => NmsSharedMessageConsumer.cs} (59%)
create mode 100644 src/NMS.AMQP/Provider/Amqp/AmqpSubscriptionTracker.cs
create mode 100644 src/NMS.AMQP/Util/Synchronization/NmsSynchronizationMonitor.cs
create mode 100644 src/NMS.AMQP/Util/Synchronization/TaskExtensions.cs
create mode 100644 src/NMS.AMQP/Util/Synchronization/TaskSynchronizationSettings.cs
copy test/{Apache-NMS-AMQP-Test => Apache-NMS-AMQP-Interop-Test}/NLog.config (94%)
create mode 100644 test/Apache-NMS-AMQP-Interop-Test/NmsMessageProducerTest.cs
copy test/Apache-NMS-AMQP-Test/Integration/{ => Async}/AmqpAcknowledgmentsIntegrationTest.cs (68%)
copy test/Apache-NMS-AMQP-Test/Integration/{ => Async}/ConnectionIntegrationTest.cs (69%)
copy test/Apache-NMS-AMQP-Test/Integration/{ => Async}/ConsumerIntegrationTest.cs (66%)
copy test/Apache-NMS-AMQP-Test/Integration/{ => Async}/FailoverIntegrationTest.cs (77%)
create mode 100644 test/Apache-NMS-AMQP-Test/Integration/Async/MessageDeliveryTimeTest.cs
copy test/Apache-NMS-AMQP-Test/Integration/{ => Async}/MessageExpirationIntegrationTest.cs (77%)
mode change 100755 => 100644
copy test/Apache-NMS-AMQP-Test/Integration/{ConsumerIntegrationTest.cs => Async/NMSConsumerIntegrationTest.cs} (53%)
create mode 100644 test/Apache-NMS-AMQP-Test/Integration/Async/NMSContextIntegrationTest.cs
copy test/Apache-NMS-AMQP-Test/Integration/{ProducerIntegrationTest.cs => Async/NMSProducerIntegrationTest.cs} (51%)
create mode 100644 test/Apache-NMS-AMQP-Test/Integration/Async/ProducerIntegrationAsyncTest.cs
copy test/Apache-NMS-AMQP-Test/Integration/{ => Async}/ProducerIntegrationTest.cs (58%)
create mode 100644 test/Apache-NMS-AMQP-Test/Integration/Async/SessionIntegrationTest.cs
copy test/Apache-NMS-AMQP-Test/Integration/{ => Async}/SubscriptionsIntegrationTest.cs (73%)
copy test/Apache-NMS-AMQP-Test/Integration/{ => Async}/TemporaryQueueIntegrationTest.cs (53%)
copy test/Apache-NMS-AMQP-Test/Integration/{ => Async}/TemporaryTopicIntegrationTest.cs (54%)
copy test/Apache-NMS-AMQP-Test/Integration/{ => Async}/TransactionsIntegrationTest.cs (72%)
create mode 100644 test/Apache-NMS-AMQP-Test/Integration/MessageDeliveryTimeTest.cs
copy test/Apache-NMS-AMQP-Test/Integration/{ConsumerIntegrationTest.cs => NMSConsumerIntegrationTest.cs} (56%)
copy test/Apache-NMS-AMQP-Test/Integration/{SessionIntegrationTest.cs => NMSContextIntegrationTest.cs} (56%)
copy test/Apache-NMS-AMQP-Test/Integration/{ProducerIntegrationTest.cs => NMSProducerIntegrationTest.cs} (56%)
create mode 100644 test/Apache-NMS-AMQP-Test/Integration/ProducerIntegrationAsyncTest.cs
create mode 100644 test/Apache-NMS-AMQP-Test/Message/Facade/AmqpNmsMessageFacadeTest.cs
create mode 100644 test/Apache-NMS-AMQP-Test/Utils/Synchronization/NmsSynchronizationMonitorTest.cs
[activemq-nms-amqp] 01/01: Merge pull request #66 from apache/2.0.x
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelpearce pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-nms-amqp.git
commit 2ea3ea2a4fafc4e2b83e531af52b868697636c48
Merge: f496e41 86359c7
Author: Michael André Pearce <mi...@apache.org>
AuthorDate: Tue Mar 23 18:22:38 2021 +0000
Merge pull request #66 from apache/2.0.x
Merge 2.0.x into master
README.md | 8 +-
package.ps1 | 2 +-
src/NMS.AMQP/Apache-NMS-AMQP.csproj | 6 +-
src/NMS.AMQP/INmsTransactionContext.cs | 1 -
src/NMS.AMQP/Message/Facade/INmsMessageFacade.cs | 3 +
.../Message/Facade/INmsObjectMessageFacade.cs | 2 +-
src/NMS.AMQP/Message/NmsBytesMessage.cs | 14 +
src/NMS.AMQP/Message/NmsMapMessage.cs | 14 +
src/NMS.AMQP/Message/NmsMessage.cs | 39 +-
src/NMS.AMQP/Message/NmsMessageTransformation.cs | 9 +-
src/NMS.AMQP/Message/NmsObjectMessage.cs | 23 +-
src/NMS.AMQP/Message/NmsStreamMessage.cs | 6 +
src/NMS.AMQP/Message/NmsTextMessage.cs | 12 +
src/NMS.AMQP/Message/OutboundMessageDispatch.cs | 2 +-
src/NMS.AMQP/Meta/NmsConnectionInfo.cs | 6 +
src/NMS.AMQP/Meta/NmsConsumerInfo.cs | 2 +
src/NMS.AMQP/NmsAcknowledgeCallback.cs | 8 +-
src/NMS.AMQP/NmsConnection.cs | 113 +-
src/NMS.AMQP/NmsConnectionFactory.cs | 54 +-
src/NMS.AMQP/NmsConsumer.cs | 113 ++
src/NMS.AMQP/NmsContext.cs | 531 +++++++
...cSubscriber.cs => NmsDurableMessageConsumer.cs} | 9 +-
src/NMS.AMQP/NmsLocalTransactionContext.cs | 21 +-
src/NMS.AMQP/NmsMessageConsumer.cs | 266 +++-
src/NMS.AMQP/NmsMessageProducer.cs | 109 +-
src/NMS.AMQP/NmsNoTxTransactionContext.cs | 1 -
src/NMS.AMQP/NmsProducer.cs | 446 ++++++
src/NMS.AMQP/NmsQueueBrowser.cs | 183 +++
src/NMS.AMQP/NmsSession.cs | 346 ++++-
...riber.cs => NmsSharedDurableMessageConsumer.cs} | 9 +-
...icSubscriber.cs => NmsSharedMessageConsumer.cs} | 11 +-
src/NMS.AMQP/NmsTemporaryDestination.cs | 10 +-
src/NMS.AMQP/Provider/Amqp/AmqpConnection.cs | 56 +-
.../Provider/Amqp/AmqpConnectionSession.cs | 5 +-
src/NMS.AMQP/Provider/Amqp/AmqpConsumer.cs | 113 +-
src/NMS.AMQP/Provider/Amqp/AmqpProducer.cs | 84 +-
src/NMS.AMQP/Provider/Amqp/AmqpProvider.cs | 33 +-
src/NMS.AMQP/Provider/Amqp/AmqpSendTask.cs | 3 +-
src/NMS.AMQP/Provider/Amqp/AmqpSession.cs | 11 +-
.../Provider/Amqp/AmqpSubscriptionTracker.cs | 327 +++++
.../Provider/Amqp/AmqpTemporaryDestination.cs | 7 +-
.../Provider/Amqp/AmqpTransactionContext.cs | 12 +-
.../Provider/Amqp/AmqpTransactionCoordinator.cs | 5 +-
.../Amqp/Message/AmqpNmsBytesMessageFacade.cs | 2 +-
.../Amqp/Message/AmqpNmsMapMessageFacade.cs | 2 +-
.../Provider/Amqp/Message/AmqpNmsMessageFacade.cs | 49 +-
.../Amqp/Message/AmqpNmsObjectMessageFacade.cs | 9 +-
.../Amqp/Message/AmqpNmsStreamMessageFacade.cs | 2 +-
.../Amqp/Message/AmqpNmsTextMessageFacade.cs | 2 +-
src/NMS.AMQP/Provider/Failover/FailoverProvider.cs | 50 +-
src/NMS.AMQP/Provider/Failover/FailoverRequest.cs | 3 +-
src/NMS.AMQP/Provider/IProvider.cs | 1 +
src/NMS.AMQP/SessionDispatcher.cs | 37 +-
src/NMS.AMQP/Util/AtomicLong.cs | 10 +
src/NMS.AMQP/Util/PriorityMessageQueue.cs | 73 +-
src/NMS.AMQP/Util/SymbolUtil.cs | 25 +-
.../Synchronization/NmsSynchronizationMonitor.cs | 280 ++++
.../Util/Synchronization/TaskExtensions.cs | 66 +
.../Synchronization/TaskSynchronizationSettings.cs | 38 +
.../Util/Types/Map/AMQP/AMQPPrimitiveMap.cs | 4 +-
src/NMS.AMQP/Util/Types/Map/AMQP/AMQPValueMap.cs | 4 +-
src/NMS.AMQP/Util/Types/Map/PrimitiveMapBase.cs | 56 +-
src/NMS.AMQP/Util/UriUtil.cs | 5 -
.../AmqpTestSupport.cs | 31 +-
.../Apache-NMS-AMQP-Interop-Test.csproj | 7 +
test/Apache-NMS-AMQP-Interop-Test/NLog.config | 27 +
.../NmsMessageConsumerTest.cs | 246 +++-
.../NmsMessageProducerTest.cs | 77 +
.../Transactions/NmsTransactedConsumerTest.cs | 2 +
.../AmqpAcknowledgmentsIntegrationTest.cs | 1 +
.../AmqpAcknowledgmentsIntegrationTest.cs | 123 +-
.../Integration/Async/ConnectionIntegrationTest.cs | 254 ++++
.../{ => Async}/ConsumerIntegrationTest.cs | 360 ++---
.../Integration/Async/FailoverIntegrationTest.cs | 1164 ++++++++++++++++
.../Integration/Async/MessageDeliveryTimeTest.cs | 182 +++
.../Async/MessageExpirationIntegrationTest.cs | 252 ++++
.../NMSConsumerIntegrationTest.cs} | 687 +++++----
.../Integration/Async/NMSContextIntegrationTest.cs | 279 ++++
.../Async/NMSProducerIntegrationTest.cs | 723 ++++++++++
.../Async/ProducerIntegrationAsyncTest.cs | 135 ++
.../Integration/Async/ProducerIntegrationTest.cs | 782 +++++++++++
.../Integration/Async/SessionIntegrationTest.cs | 289 ++++
.../Async/SubscriptionsIntegrationTest.cs | 74 +
.../Async/TemporaryQueueIntegrationTest.cs | 88 ++
.../Async/TemporaryTopicIntegrationTest.cs | 89 ++
.../Async/TransactionsIntegrationTest.cs | 1473 ++++++++++++++++++++
.../Integration/ConsumerIntegrationTest.cs | 2 +
.../Integration/IntegrationTestFixture.cs | 43 +-
.../Integration/MessageDeliveryTimeTest.cs | 181 +++
...rationTest.cs => NMSConsumerIntegrationTest.cs} | 709 ++++++----
...grationTest.cs => NMSContextIntegrationTest.cs} | 201 ++-
.../Integration/NMSProducerIntegrationTest.cs | 722 ++++++++++
.../Integration/ProducerIntegrationAsyncTest.cs | 135 ++
.../Integration/SessionIntegrationTest.cs | 57 +
.../Message/Facade/AmqpNmsMessageFacadeTest.cs | 29 +
.../Message/Facade/NmsTestMessageFacade.cs | 6 +
.../Message/Facade/NmsTestObjectMessageFacade.cs | 4 +-
.../Message/Foreign/ForeignNmsMessage.cs | 22 +
.../Message/NmsObjectMessageTest.cs | 8 +-
.../Provider/Amqp/AmqpMessageFactoryTest.cs | 6 +-
.../Amqp/AmqpNmsObjectMessageFacadeTest.cs | 34 +-
.../Provider/Mock/MockProvider.cs | 5 +
test/Apache-NMS-AMQP-Test/TestAmqp/NLogAdapter.cs | 2 +-
test/Apache-NMS-AMQP-Test/TestAmqp/TestAmqpPeer.cs | 44 +
.../TestAmqp/TestAmqpPeerRunner.cs | 8 +-
.../NmsSynchronizationMonitorTest.cs | 437 ++++++
106 files changed, 12374 insertions(+), 1379 deletions(-)