Update address format v2

References rabbitmq/rabbitmq-server#11618

Author: acogoluegnes

src/docs/asciidoc/usage.adoc

@@ -65,21 +65,21 @@ include::{test-examples}/Api.java[tag=message-publishing]
 --------
 include::{test-examples}/Api.java[tag=target-address-exchange-key]
 --------
-<1> Translates to `/e/foo/bar`
+<1> Translates to `/exchanges/foo/bar`
 
 .Target address format: exchange
 [source,java,indent=0]
 --------
 include::{test-examples}/Api.java[tag=target-address-exchange]
 --------
-<1> Translates to `/e/foo`
+<1> Translates to `/exchanges/foo`
 
 .Target address format: queue
 [source,java,indent=0]
 --------
 include::{test-examples}/Api.java[tag=target-address-queue]
 --------
-<1> Translates to `/q/some-queue`
+<1> Translates to `/queues/some-queue`
 
 .Target address format: address in `to` field
 [source,java,indent=0]

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

@@ -59,12 +59,12 @@ public T queue(String queue) {
   String address() {
     if (this.exchange != null) {
       if (this.key != null && !this.key.isEmpty()) {
-        return "/e/" + encodePathSegment(this.exchange) + "/" + encodePathSegment(this.key);
+        return "/exchanges/" + encodePathSegment(this.exchange) + "/" + encodePathSegment(this.key);
       } else {
-        return "/e/" + encodePathSegment(this.exchange);
+        return "/exchanges/" + encodePathSegment(this.exchange);
       }
     } else if (this.queue != null) {
-      return "/q/" + encodePathSegment(this.queue);
+      return "/queues/" + encodePathSegment(this.queue);
     } else {
       return null;
     }

src/main/java/com/rabbitmq/client/amqp/observation/micrometer/Utils.java

@@ -25,9 +25,9 @@ abstract class Utils {
 
   private Utils() {}
 
-  private static final String EXCHANGE_DELIMITER = "/e/";
+  private static final String EXCHANGE_DELIMITER = "/exchanges/";
   private static final String KEY_DELIMITER = "/";
-  private static final String QUEUE_DELIMITER = "/q/";
+  private static final String QUEUE_DELIMITER = "/queues/";
   private static final int EXCHANGE_DELIMITER_LENGTH = EXCHANGE_DELIMITER.length();
   private static final int KEY_DELIMITER_LENGTH = KEY_DELIMITER.length();
   private static final int QUEUE_DELIMITER_LENGTH = QUEUE_DELIMITER.length();

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

@@ -26,12 +26,12 @@ public class AmqpMessageTest {
   @Test
   void toShouldBePathEncoded() {
     assertThat(new AmqpMessage().toAddress().exchange("foo bar").message().to())
-        .isEqualTo("/e/foo%20bar");
+        .isEqualTo("/exchanges/foo%20bar");
   }
 
   @Test
   void replyToShouldBePathEncoded() {
     assertThat(new AmqpMessage().replyToAddress().exchange("foo bar").message().replyTo())
-        .isEqualTo("/e/foo%20bar");
+        .isEqualTo("/exchanges/foo%20bar");
   }
 }

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

@@ -91,7 +91,7 @@ void deliveryCount() throws Exception {
                       publisher.message("".getBytes(UTF_8)), context -> publishLatch.countDown()));
 
       org.apache.qpid.protonj2.client.Connection protonConnection = connection(client);
-      Receiver receiver = protonConnection.openReceiver("/q/" + q, new ReceiverOptions());
+      Receiver receiver = protonConnection.openReceiver("/queues/" + q, new ReceiverOptions());
       int receivedMessages = 0;
       while (receiver.receive(100, TimeUnit.MILLISECONDS) != null) {
         receivedMessages++;
@@ -108,15 +108,15 @@ void largeMessage() throws Exception {
           connection(client, o -> o.traceFrames(false).maxFrameSize(maxFrameSize));
 
       Sender sender =
-          connection.openSender("/q/" + q, new SenderOptions().deliveryMode(AT_LEAST_ONCE));
+          connection.openSender("/queues/" + q, new SenderOptions().deliveryMode(AT_LEAST_ONCE));
       byte[] body = new byte[maxFrameSize * 4];
       Arrays.fill(body, (byte) 'A');
       Tracker tracker = sender.send(Message.create(body));
       tracker.awaitSettlement();
 
       Receiver receiver =
           connection.openReceiver(
-              "/q/" + q,
+              "/queues/" + q,
               new ReceiverOptions()
                   .deliveryMode(AT_LEAST_ONCE)
                   .autoSettle(false)
@@ -138,7 +138,7 @@ void largeMessageStreamSupport() throws Exception {
 
       StreamSender sender =
           connection.openStreamSender(
-              "/q/" + q, new StreamSenderOptions().deliveryMode(AT_LEAST_ONCE));
+              "/queues/" + q, new StreamSenderOptions().deliveryMode(AT_LEAST_ONCE));
       StreamSenderMessage message = sender.beginMessage();
       byte[] body = new byte[maxFrameSize * 4];
       Arrays.fill(body, (byte) 'A');
@@ -155,7 +155,7 @@ void largeMessageStreamSupport() throws Exception {
 
       StreamReceiver receiver =
           connection.openStreamReceiver(
-              "/q/" + q,
+              "/queues/" + q,
               new StreamReceiverOptions()
                   .deliveryMode(AT_LEAST_ONCE)
                   .autoAccept(false)
@@ -269,7 +269,7 @@ void queueDeletionImpactOnReceiver(TestInfo info) throws Exception {
 
       org.apache.qpid.protonj2.client.Connection protonConnection = connection(client);
       Session session = protonConnection.openSession();
-      Receiver receiver = session.openReceiver("/q/" + queue);
+      Receiver receiver = session.openReceiver("/queues/" + queue);
       receiver.openFuture().get();
       Delivery delivery = receiver.tryReceive();
       assertThat(delivery).isNull();
@@ -295,7 +295,8 @@ void exchangeDeletionImpactOnSender(TestInfo info) throws Exception {
       org.apache.qpid.protonj2.client.Connection protonConnection = connection(client);
       Session session = protonConnection.openSession();
       Sender sender =
-          session.openSender("/e/" + exchange, new SenderOptions().deliveryMode(AT_LEAST_ONCE));
+          session.openSender(
+              "/exchanges/" + exchange, new SenderOptions().deliveryMode(AT_LEAST_ONCE));
       Tracker tracker = sender.send(Message.create(body));
       tracker.awaitSettlement(10, SECONDS);
       assertThat(tracker.remoteState()).isEqualTo(released());

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

@@ -25,12 +25,12 @@ public class DefaultAddressBuilderTest {
 
   @Test
   void pathSegmentsShouldBePercentEncoded() {
-    assertThat(b().exchange("foo").address()).isEqualTo("/e/foo");
-    assertThat(b().exchange("foo").key("bar").address()).isEqualTo("/e/foo/bar");
-    assertThat(b().exchange("foo bar").address()).isEqualTo("/e/foo%20bar");
-    assertThat(b().exchange("foo").key("b ar").address()).isEqualTo("/e/foo/b%20ar");
-    assertThat(b().queue("foo").address()).isEqualTo("/q/foo");
-    assertThat(b().queue("foo bar").address()).isEqualTo("/q/foo%20bar");
+    assertThat(b().exchange("foo").address()).isEqualTo("/exchanges/foo");
+    assertThat(b().exchange("foo").key("bar").address()).isEqualTo("/exchanges/foo/bar");
+    assertThat(b().exchange("foo bar").address()).isEqualTo("/exchanges/foo%20bar");
+    assertThat(b().exchange("foo").key("b ar").address()).isEqualTo("/exchanges/foo/b%20ar");
+    assertThat(b().queue("foo").address()).isEqualTo("/queues/foo");
+    assertThat(b().queue("foo bar").address()).isEqualTo("/queues/foo%20bar");
   }
 
   TestAddressBuilder b() {

src/test/java/com/rabbitmq/client/amqp/observation/micrometer/UtilsTest.java

@@ -28,12 +28,12 @@ public class UtilsTest {
   @ParameterizedTest
   @CsvSource(
       value = {
-        "/e/foo/bar,foo,bar",
-        "/e/foo,foo,NULL",
-        "/e/foo%20bar,foo bar,NULL",
-        "/e/foo%20bar/bar%25foo,foo bar,bar%foo",
-        "/q/bar,'',bar",
-        "/q/foo%20bar,'',foo bar",
+        "/exchanges/foo/bar,foo,bar",
+        "/exchanges/foo,foo,NULL",
+        "/exchanges/foo%20bar,foo bar,NULL",
+        "/exchanges/foo%20bar/bar%25foo,foo bar,bar%foo",
+        "/queues/bar,'',bar",
+        "/queues/foo%20bar,'',foo bar",
         "not a address,NULL,NULL"
       },
       nullValues = "NULL")