Merge pull request #85 from rabbitmq/validate-annotation-key

Validate key annotation to start with x-

Author: acogoluegnes

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

@@ -499,6 +499,7 @@ public Object annotation(String key) {
 
   @Override
   public Message annotation(String key, Object value) {
+    Utils.validateMessageAnnotationKey(key);
     callOnDelegate(m -> m.annotation(key, value));
     return this;
   }

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

@@ -100,13 +100,13 @@ private static boolean isJava21OrMore() {
   }
 
   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-': " + k);
-          }
-        });
+    annotations.forEach((k, v) -> validateMessageAnnotationKey(k));
+  }
+
+  static void validateMessageAnnotationKey(String key) {
+    if (!key.startsWith("x-")) {
+      throw new IllegalArgumentException("Message annotation keys must start with 'x-': " + key);
+    }
   }
 
   private static class NamedThreadFactory implements ThreadFactory {