SB Track2: Expose AMQP details ServiceBus Messages for sending and receiving. #14848

hemanttanwar · 2020-09-04T21:17:59Z

Expose AMQP details ServiceBus Messages for sending and receiving.

API View : https://apiview.dev/Assemblies/Review/64f40be9988242c9a8facc8a20c5e9e7
fixes #14385

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpAnnotatedMessage.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpBodyType.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpDataBody.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpMessageProperties.java

sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/models/AmqpAnnotatedMessageTest.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpAnnotatedMessage.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpMessageHeader.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/BinaryData.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpMessageHeader.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpMessageProperties.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/BinaryData.java

sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/models/AmqpAnnotatedMessageTest.java

...ure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessage.java

...aging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceivedMessage.java

...ing-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessageSerializer.java

...aging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceivedMessage.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpDataBody.java

...servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpMessageHeader.java

sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/models/AmqpAnnotatedMessageTest.java

sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/models/AmqpDataBodyTest.java

...ure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessage.java

...messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusMessageTest.java

...g-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceivedMessageTest.java

...c/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java

...servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java

...ure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessage.java

conniey · 2020-09-09T21:53:36Z

...ure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessage.java

@@ -353,7 +392,10 @@ public OffsetDateTime getScheduledEnqueueTime() {
     * @see #getScheduledEnqueueTime()
     */
    public ServiceBusMessage setScheduledEnqueueTime(OffsetDateTime scheduledEnqueueTime) {
-        this.scheduledEnqueueTime = scheduledEnqueueTime;
+        if (scheduledEnqueueTime != null) {


What if they're trying to clear the scheduledEnqueueTime? Isn't null a value option to pass? Same with other instances.

Internally these key,value pair is stored in Map and Null value is not allowed.
The code on master is also checking for null and not putting in map is user provided null value.
User can get Map using amqpAnnotatedMessage.getMessageAnnotations() and remove a key if they do not want it.

May be worthwhile to document here. it's odd having one method do one thing and then the other do something else.

...ing-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessageSerializer.java

conniey

LGTM. A couple of comments.

sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md

conniey · 2020-09-10T00:33:40Z

...ure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessage.java

@@ -353,7 +392,10 @@ public OffsetDateTime getScheduledEnqueueTime() {
     * @see #getScheduledEnqueueTime()
     */
    public ServiceBusMessage setScheduledEnqueueTime(OffsetDateTime scheduledEnqueueTime) {
-        this.scheduledEnqueueTime = scheduledEnqueueTime;
+        if (scheduledEnqueueTime != null) {


May be worthwhile to document here. it's odd having one method do one thing and then the other do something else.

…ceiving. (Azure#14848) Expose AMQP details ServiceBus Messages for sending and receiving.

* SB Track2: Expose AMQP details ServiceBus Messages for sending and receiving. (#14848) Expose AMQP details ServiceBus Messages for sending and receiving. * Force closes links when connection is closed so it requests another link. (#14990) * Fixing the string format for Dispatch task. * Cleaning up print statements. * Updating text in README.md * Remove getErrors() which overlaps with getEndpointStates(). Only ouputting one terminal state. * Clean up tests and use subscribeWith. * Locally closing on connection error. * Add changelog entry * Update versions. * Update versions for service bus and event hubs * Update CHANGELOG.md Update the date on CHANGELOG Co-authored-by: Hemant Tanwar <hemant_tanwar@hotmail.com>

Hemant Tanwar added 8 commits September 1, 2020 18:20

Continue Implementation

002335f

Continue implementation

672b166

Continue implementation

10f0647

Continue implementation

5cd4b18

Continue implementation

7dee518

Merge branch 'master' into sb-track2-expose-amqp-message-details-14385

eea67f1

Continue initial draft implementation: moved sbrm to models

0e3956c

Draft implementation

735f657

ghost added Azure.Core azure-core Service Bus labels Sep 4, 2020

Hemant Tanwar added 2 commits September 4, 2020 14:31

Draft implementation

a4100f0

Removed commented code

6614ebd

hemanttanwar requested review from conniey and YijunXieMS September 4, 2020 21:48

conniey reviewed Sep 4, 2020

View reviewed changes

YijunXieMS reviewed Sep 5, 2020

View reviewed changes

Added more implementation

00f7a82

conniey requested changes Sep 6, 2020

View reviewed changes

conniey reviewed Sep 7, 2020

View reviewed changes

...ing-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusMessageSerializer.java Outdated Show resolved Hide resolved

Hemant Tanwar added 5 commits September 7, 2020 23:12

Incorporated Review comments

ec6758b

Incorporated Review comments

587d2e9

fixing some test

8fbbf9f

Fixing text

0863421

Fix test and checkstyle

72c3818

conniey reviewed Sep 8, 2020

View reviewed changes

...aging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceivedMessage.java Outdated Show resolved Hide resolved

...aging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceivedMessage.java Outdated Show resolved Hide resolved

conniey reviewed Sep 8, 2020

View reviewed changes

...aging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceivedMessage.java Outdated Show resolved Hide resolved

conniey reviewed Sep 8, 2020

View reviewed changes

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/AmqpDataBody.java Show resolved Hide resolved

Hemant Tanwar added 2 commits September 8, 2020 14:21

Incorporated review comments.

836e6b3

Added unit test case.

2d680f1

hemanttanwar commented Sep 8, 2020

View reviewed changes

...servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientTest.java Show resolved Hide resolved

Added unit test case and general cleanup

b4baee7

hemanttanwar requested a review from conniey September 8, 2020 22:56

Hemant Tanwar added 2 commits September 8, 2020 16:16

Added unit test case and general cleanup

b475d65

Added change log.

6cf5072

hemanttanwar marked this pull request as ready for review September 8, 2020 23:27

hemanttanwar requested review from alzimmermsft, anuchandy, jianghaolu, srnagar and yvgopal as code owners September 8, 2020 23:27

conniey reviewed Sep 9, 2020

View reviewed changes

Adding more unit test

947d146

hemanttanwar requested a review from conniey September 9, 2020 08:16

Hemant Tanwar added 4 commits September 9, 2020 01:22

Adding more unit test

814cd01

Merge branch 'master' into sb-track2-expose-amqp-message-details-14385

5f7fa17

Added more comment

72c4476

Added more check in unit test

e019fc5

hemanttanwar mentioned this pull request Sep 9, 2020

SB Track2 - Verify - Batch Size calculated with correct overhead bytes - After adding AMQP Annotated Message #14980

Closed

Adding more test

5243462

conniey reviewed Sep 9, 2020

View reviewed changes

Review comments

3fe4224

hemanttanwar requested a review from conniey September 9, 2020 22:59

conniey approved these changes Sep 10, 2020

View reviewed changes

Adding java doc

ea1ee38

hemanttanwar merged commit 70d16c3 into Azure:master Sep 10, 2020

hemanttanwar deleted the sb-track2-expose-amqp-message-details-14385 branch September 10, 2020 02:09

conniey pushed a commit to conniey/azure-sdk-for-java that referenced this pull request Sep 11, 2020

SB Track2: Expose AMQP details ServiceBus Messages for sending and re…

efdeaa7

…ceiving. (Azure#14848) Expose AMQP details ServiceBus Messages for sending and receiving.

Melanie-Ma mentioned this pull request Oct 14, 2020

Service Bus Sample issues #15507

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SB Track2: Expose AMQP details ServiceBus Messages for sending and receiving. #14848

SB Track2: Expose AMQP details ServiceBus Messages for sending and receiving. #14848

hemanttanwar commented Sep 4, 2020 •

edited

Loading

conniey Sep 9, 2020

hemanttanwar Sep 9, 2020 •

edited

Loading

conniey Sep 10, 2020

conniey left a comment

conniey Sep 10, 2020

SB Track2: Expose AMQP details ServiceBus Messages for sending and receiving. #14848

SB Track2: Expose AMQP details ServiceBus Messages for sending and receiving. #14848

Conversation

hemanttanwar commented Sep 4, 2020 • edited Loading

conniey Sep 9, 2020

Choose a reason for hiding this comment

hemanttanwar Sep 9, 2020 • edited Loading

Choose a reason for hiding this comment

conniey Sep 10, 2020

Choose a reason for hiding this comment

conniey left a comment

Choose a reason for hiding this comment

conniey Sep 10, 2020

Choose a reason for hiding this comment

hemanttanwar commented Sep 4, 2020 •

edited

Loading

hemanttanwar Sep 9, 2020 •

edited

Loading