Prefix message annotations

Co-authored-by: Stanchev Aleksandar <aleksandar.stanchev@bosch.io> Signed-off-by: David Schwilk <david.schwilk@bosch.io>
eclipse-ditto · Oct 6, 2022 · 63bbc57 · 63bbc57
1 parent d996447
commit 63bbc57
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/...rc/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/JMSPropertyMapper.java b/...rc/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/JMSPropertyMapper.java
@@ -360,9 +360,7 @@ private static void readAmqpMessageAnnotationsFromMessage(final Message message,
             wrap(msg -> {
                 facade.filterTracingAnnotations((key, value) -> {
                     if (value != null) {
-                        final var headerName = isDefinedAmqpProperty(key)
-                                ? AMQP.MESSAGE_ANNOTATION_PREFIX + key
-                                : key;
+                        final var headerName = AMQP.MESSAGE_ANNOTATION_PREFIX + key;
                         headers.put(headerName, value.toString());
                     }
                 });

diff --git a/...st/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpPublisherActorTest.java b/...st/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpPublisherActorTest.java
@@ -466,7 +466,7 @@ public void testPublishMessageWithAmqpProperties() throws Exception {
             assertThat(receivedHeaders).containsEntry("amqp.application.property:to", "value1");
             assertThat(receivedHeaders).containsEntry("anotherApplicationProperty", "value2");
             // group-sequence is an AMQP prop of type "int", therefore it must not be contained in the headers here
-            assertThat(receivedHeaders).containsEntry("message-annotation", "value3");
+            assertThat(receivedHeaders).containsEntry("amqp.message.annotation:message-annotation", "value3");
             assertThat(receivedHeaders).doesNotContainKey("group-sequence");
         }};
 

diff --git a/...ntation/src/main/resources/pages/ditto/connectivity-protocol-bindings-amqp10.md b/...ntation/src/main/resources/pages/ditto/connectivity-protocol-bindings-amqp10.md
@@ -73,8 +73,8 @@ the message annotation `to` to the value of the Ditto protocol header `reply-to`
 }
 ```
 
-To read a message annotation whose name is identical to an AMQP 1.0 property, prefix it by `amqp.message.
-annotation:`. The following [source header mapping](basic-connections.html#source-header-mapping) sets
+To read a message annotation, prefix it by `amqp.message.annotation:`. 
+The following [source header mapping](basic-connections.html#source-header-mapping) sets
 the Ditto protocol header `reply-to` to the value of the message annotation `to`:
 ```json
 {