-
Notifications
You must be signed in to change notification settings - Fork 581
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Introduce IBasicPublishBatch #368
Merged
Merged
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
3295551
Batch Publish
YulerB 253afa9
Merge pull request #1 from YulerB/YulerB-feature-batch
YulerB f8f3b47
Batch Publish Missing Items
YulerB a21fc48
Removing commented code.
YulerB a1fe5d4
Updating Indenting.
YulerB 4876214
Updating line endings to unix
YulerB 738c3c3
Removing Commented code
YulerB 52cb320
Change BatchMessage for the IMessageBatch abstraction.
kjnilsson e8070ec
merge
kjnilsson c020263
Add missing license headers
kjnilsson 74c9c24
MessageBatch -> BasicPublishBatch
kjnilsson 4e655c2
Use publisher confirms in this test
michaelklishin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
projects/client/RabbitMQ.Client/src/client/api/IMessageBatch.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // This source code is dual-licensed under the Apache License, version | ||
| // 2.0, and the Mozilla Public License, version 1.1. | ||
| // | ||
| // The APL v2.0: | ||
| // | ||
| //--------------------------------------------------------------------------- | ||
| // Copyright (c) 2007-2016 Pivotal Software, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| //--------------------------------------------------------------------------- | ||
| // | ||
| // The MPL v1.1: | ||
| // | ||
| //--------------------------------------------------------------------------- | ||
| // The contents of this file are subject to the Mozilla Public License | ||
| // Version 1.1 (the "License"); you may not use this file except in | ||
| // compliance with the License. You may obtain a copy of the License | ||
| // at http://www.mozilla.org/MPL/ | ||
| // | ||
| // Software distributed under the License is distributed on an "AS IS" | ||
| // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See | ||
| // the License for the specific language governing rights and | ||
| // limitations under the License. | ||
| // | ||
| // The Original Code is RabbitMQ. | ||
| // | ||
| // The Initial Developer of the Original Code is Pivotal Software, Inc. | ||
| // Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. | ||
| //--------------------------------------------------------------------------- | ||
| namespace RabbitMQ.Client | ||
| { | ||
| public interface IMessageBatch | ||
| { | ||
| void Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, byte[] body); | ||
| void Publish(); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
projects/client/RabbitMQ.Client/src/client/impl/MessageBatch.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // This source code is dual-licensed under the Apache License, version | ||
| // 2.0, and the Mozilla Public License, version 1.1. | ||
| // | ||
| // The APL v2.0: | ||
| // | ||
| //--------------------------------------------------------------------------- | ||
| // Copyright (c) 2007-2016 Pivotal Software, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| //--------------------------------------------------------------------------- | ||
| // | ||
| // The MPL v1.1: | ||
| // | ||
| //--------------------------------------------------------------------------- | ||
| // The contents of this file are subject to the Mozilla Public License | ||
| // Version 1.1 (the "License"); you may not use this file except in | ||
| // compliance with the License. You may obtain a copy of the License | ||
| // at http://www.mozilla.org/MPL/ | ||
| // | ||
| // Software distributed under the License is distributed on an "AS IS" | ||
| // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See | ||
| // the License for the specific language governing rights and | ||
| // limitations under the License. | ||
| // | ||
| // The Original Code is RabbitMQ. | ||
| // | ||
| // The Initial Developer of the Original Code is Pivotal Software, Inc. | ||
| // Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. | ||
| //--------------------------------------------------------------------------- | ||
|
|
||
| namespace RabbitMQ.Client.Impl | ||
| { | ||
| using System.Collections.Generic; | ||
| using RabbitMQ.Client; | ||
| using RabbitMQ.Client.Framing.Impl; | ||
| using RabbitMQ.Client.Impl; | ||
|
|
||
| public class MessageBatch : IMessageBatch | ||
| { | ||
| private List<Command> commands = new List<Command>(); | ||
| private ModelBase model; | ||
| internal MessageBatch(ModelBase model) | ||
| { | ||
| this.model = model; | ||
| } | ||
|
|
||
| public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, byte[] body) | ||
| { | ||
| var bp = basicProperties == null ? model.CreateBasicProperties() : basicProperties; | ||
| var method = new BasicPublish | ||
| { | ||
| m_exchange = exchange, | ||
| m_routingKey = routingKey, | ||
| m_mandatory = mandatory | ||
| }; | ||
|
|
||
| commands.Add(new Command(method, (ContentHeaderBase)bp, body)); | ||
| } | ||
|
|
||
| public void Publish() | ||
| { | ||
| model.SendCommands(commands); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would love an overload called AddRange that took an IEnumerable of Message that contained these elements.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's something that could be very easily added as an application specific extension method as required. From a core api point of view I don't see the need to introduce a
Messagetype to hold the fields in question (If I understood your request correctly).that said maybe the name
IMessageBatchisn't that great -IBasicPublishBatchfeels more appropriate perhaps.