Make sure message annotation keys start with x-

Author: acogoluegnes

src/main/java/com/rabbitmq/client/amqp/impl/AmqpConsumer.java

@@ -393,7 +393,7 @@ public void discard(Map<String, Object> annotations) {
       if (settled.compareAndSet(false, true)) {
         try {
           annotations = annotations == null ? Collections.emptyMap() : annotations;
-          checkAnnotations(annotations);
+          Utils.checkMessageAnnotations(annotations);
           protonExecutor.execute(replenishCreditOperation);
           delivery.disposition(DeliveryState.modified(true, true, annotations), true);
           unsettledMessageCount.decrementAndGet();
@@ -427,7 +427,7 @@ public void requeue(Map<String, Object> annotations) {
       if (settled.compareAndSet(false, true)) {
         try {
           annotations = annotations == null ? Collections.emptyMap() : annotations;
-          checkAnnotations(annotations);
+          Utils.checkMessageAnnotations(annotations);
           protonExecutor.execute(replenishCreditOperation);
           delivery.disposition(DeliveryState.modified(false, false, annotations), true);
           unsettledMessageCount.decrementAndGet();
@@ -440,14 +440,4 @@ public void requeue(Map<String, Object> annotations) {
       }
     }
   }
-
-  static void checkAnnotations(Map<String, Object> annotations) {
-    annotations.forEach(
-        (k, v) -> {
-          if (!k.startsWith("x-opt-")) {
-            throw new IllegalArgumentException(
-                "Message annotation keys must start with 'x-opt-': " + k);
-          }
-        });
-  }
 }

src/main/java/com/rabbitmq/client/amqp/impl/Utils.java

@@ -25,6 +25,7 @@
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicLong;
@@ -98,6 +99,16 @@ private static boolean isJava21OrMore() {
     return Runtime.version().compareTo(Runtime.Version.parse("21")) >= 0;
   }
 
+  static void checkMessageAnnotations(Map<String, Object> annotations) {
+    annotations.forEach(
+        (k, v) -> {
+          if (!k.startsWith("x-")) {
+            throw new IllegalArgumentException(
+                "Message annotation keys must start with 'x-opt-': " + k);
+          }
+        });
+  }
+
   private static class NamedThreadFactory implements ThreadFactory {
 
     private final ThreadFactory backingThreadFactory;

src/test/java/com/rabbitmq/client/amqp/impl/AmqpConsumerTest.java

@@ -17,7 +17,10 @@
 // [email protected].
 package com.rabbitmq.client.amqp.impl;
 
+import static com.rabbitmq.client.amqp.impl.Utils.checkMessageAnnotations;
+import static java.util.Map.of;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -44,4 +47,19 @@ void validateMaxAgeOK(String input) {
   void validateMaxAgeKO(String input) {
     assertThat(Utils.validateMaxAge(input)).isFalse();
   }
+
+  @Test
+  void checkAnnotationsOK() {
+    checkMessageAnnotations(of());
+    checkMessageAnnotations(of("x-foo", "bar"));
+    checkMessageAnnotations(of("x-foo-1", "bar1", "x-foo-2", "bar2"));
+  }
+
+  @Test
+  void checkAnnotationsKO() {
+    assertThatThrownBy(() -> checkMessageAnnotations(of("foo", "bar")))
+        .isInstanceOf(IllegalArgumentException.class);
+    assertThatThrownBy(() -> checkMessageAnnotations(of("x-foo", "bar1", "foo", "bar2")))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
 }