Tweak Javadoc

Author: acogoluegnes

src/main/java/com/rabbitmq/client/amqp/AddressBuilder.java

@@ -18,8 +18,8 @@
 package com.rabbitmq.client.amqp;
 
 /**
- * Builder for a <a href="https://www.rabbitmq.com/docs/amqp#address-v2">AMQP target address
- * format v2.</a>
+ * Builder for a <a href="https://www.rabbitmq.com/docs/amqp#address-v2">AMQP target address format
+ * v2.</a>
  *
  * @param <T> the type of object returned by methods, usually the object itself
  */

src/main/java/com/rabbitmq/client/amqp/Consumer.java

@@ -83,7 +83,9 @@ interface Context {
      * <p>This means the message cannot be processed because it is invalid, the broker can drop it
      * or dead-letter it if it is configured.
      *
-     * <p>Annotation keys must start with the <code>x-opt-</code> prefix.
+     * <p>Application-specific annotation keys must start with the <code>x-opt-</code> prefix.
+     * Annotation keys the broker understands starts with <code>x-</code>, but not with <code>x-opt-
+     * </code>.
      *
      * <p>This maps to the AMQP 1.0 <code>
      * modified{delivery-failed = true, undeliverable-here = true}</code> outcome.
@@ -109,7 +111,9 @@ interface Context {
      * <p>This means the message has not been processed and the broker can requeue it and deliver it
      * to the same or a different consumer.
      *
-     * <p>Annotation keys must start with the <code>x-opt-</code> prefix.
+     * <p>Application-specific annotation keys must start with the <code>x-opt-</code> prefix.
+     * Annotation keys the broker understands starts with <code>x-</code>, but not with <code>x-opt-
+     * </code>.
      *
      * <p>This maps to the AMQP 1.0 <code>
      * modified{delivery-failed = false, undeliverable-here = false}</code> outcome.

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

@@ -104,7 +104,7 @@ static void checkMessageAnnotations(Map<String, Object> annotations) {
         (k, v) -> {
           if (!k.startsWith("x-")) {
             throw new IllegalArgumentException(
-                "Message annotation keys must start with 'x-opt-': " + k);
+                "Message annotation keys must start with 'x-': " + k);
           }
         });
   }

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

@@ -56,8 +56,6 @@ void init(TestInfo info) {
     this.q = TestUtils.name(info);
     this.dlx = TestUtils.name(info);
     this.dlq = TestUtils.name(info);
-
-    //    this.connection.
   }
 
   @AfterEach