This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
The following commit(s) were added to refs/heads/main by this push:
new 290c2791 PROTON-2796 Ensure source and target address values set are
matched
290c2791 is described below
commit 290c279195b8b5f37938f7245313cc08cb692c2a
Author: Timothy Bish <[email protected]>
AuthorDate: Mon Feb 26 14:44:51 2024 -0500
PROTON-2796 Ensure source and target address values set are matched
Use consistent values for creating senders and receivers in the source
and target address element. Add tests to cover this expectation.
---
.../org/apache/qpid/protonj2/client/impl/ClientSenderBuilder.java | 2 +-
.../test/java/org/apache/qpid/protonj2/client/impl/ReceiverTest.java | 5 ++++-
.../test/java/org/apache/qpid/protonj2/client/impl/SenderTest.java | 5 ++++-
.../org/apache/qpid/protonj2/client/impl/StreamReceiverTest.java | 5 ++++-
.../java/org/apache/qpid/protonj2/client/impl/StreamSenderTest.java | 3 ++-
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git
a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientSenderBuilder.java
b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientSenderBuilder.java
index 850cc690..92886c51 100644
---
a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientSenderBuilder.java
+++
b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientSenderBuilder.java
@@ -117,7 +117,7 @@ final class ClientSenderBuilder {
protonSender.setDesiredCapabilities(ClientConversionSupport.toSymbolArray(options.desiredCapabilities()));
protonSender.setProperties(ClientConversionSupport.toSymbolKeyedMap(options.properties()));
protonSender.setTarget(createTarget(address, options));
- protonSender.setSource(createSource(senderId, options));
+ protonSender.setSource(createSource(address, options));
if (tagGenerator == null) {
// Use a tag generator that will reuse old tags if not sending
settled.
diff --git
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/ReceiverTest.java
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/ReceiverTest.java
index a3d62ae4..0b72e7d9 100644
---
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/ReceiverTest.java
+++
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/ReceiverTest.java
@@ -106,7 +106,10 @@ public class ReceiverTest extends ImperativeClientTestCase
{
peer.expectSASLAnonymousConnect();
peer.expectOpen().respond();
peer.expectBegin().respond();
-
peer.expectAttach().ofReceiver().withSource().withDistributionMode(nullValue()).and().respond();
+ peer.expectAttach().ofReceiver()
+
.withSource().withAddress("test-queue").withDistributionMode(nullValue()).and()
+ .withTarget().withAddress("test-queue").and().
+ respond();
peer.expectFlow().withLinkCredit(10);
peer.expectDetach().withClosed(close).respond();
peer.expectClose().respond();
diff --git
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/SenderTest.java
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/SenderTest.java
index 09c6d6c8..7a576ef7 100644
---
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/SenderTest.java
+++
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/SenderTest.java
@@ -108,7 +108,10 @@ public class SenderTest extends ImperativeClientTestCase {
peer.expectSASLAnonymousConnect();
peer.expectOpen().respond();
peer.expectBegin().respond();
- peer.expectAttach().ofSender().respond();
+ peer.expectAttach().ofSender()
+ .withSource().withAddress("test-queue").and()
+ .withTarget().withAddress("test-queue").and()
+ .respond();
peer.expectDetach().withClosed(close).respond();
peer.expectClose().respond();
peer.start();
diff --git
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamReceiverTest.java
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamReceiverTest.java
index d7843ee4..5b89763b 100644
---
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamReceiverTest.java
+++
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamReceiverTest.java
@@ -107,7 +107,10 @@ class StreamReceiverTest extends ImperativeClientTestCase {
peer.expectSASLAnonymousConnect();
peer.expectOpen().respond();
peer.expectBegin().respond();
- peer.expectAttach().ofReceiver().respond();
+ peer.expectAttach().ofReceiver()
+ .withSource().withAddress("test-queue").and()
+ .withTarget().withAddress("test-queue").and()
+ .respond();
peer.expectFlow().withLinkCredit(10);
peer.expectDetach().withClosed(close).respond();
peer.expectEnd().respond();
diff --git
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamSenderTest.java
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamSenderTest.java
index 537d6da1..24de6f3b 100644
---
a/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamSenderTest.java
+++
b/protonj2-client/src/test/java/org/apache/qpid/protonj2/client/impl/StreamSenderTest.java
@@ -197,7 +197,8 @@ public class StreamSenderTest extends
ImperativeClientTestCase {
peer.expectOpen().respond();
peer.expectBegin().respond();
peer.expectAttach().withRole(Role.SENDER.getValue())
- .withTarget().withCapabilities("queue").and()
+
.withTarget().withAddress("test-queue").withCapabilities("queue").and()
+ .withSource().withAddress("test-queue").and()
.respond();
peer.expectDetach().respond();
peer.expectEnd().respond();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
