Use "new" v2 address format

References rabbitmq/rabbitmq-server#11604

Author: acogoluegnes

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

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

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

@@ -138,9 +138,9 @@ static ThreadFactory defaultThreadFactory() {
   static String extractQueueFromSourceAddress(String address) {
     if (address == null) {
       return null;
-    } else if (address.startsWith("/queue/")) {
-      return address.replace("/queue/", "");
-    } else if (address.startsWith("/exchange/") || address.startsWith("/topic/")) {
+    } else if (address.startsWith("/q/")) {
+      return address.replace("/q/", "");
+    } else if (address.startsWith("/e/")) {
       return null;
     } else {
       return null;

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

@@ -21,9 +21,9 @@ abstract class Utils {
 
   private Utils() {}
 
-  private static final String EXCHANGE_DELIMITER = "/exchange/";
-  private static final String KEY_DELIMITER = "/key/";
-  private static final String QUEUE_DELIMITER = "/queue/";
+  private static final String EXCHANGE_DELIMITER = "/e/";
+  private static final String KEY_DELIMITER = "/";
+  private static final String QUEUE_DELIMITER = "/q/";
   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();
@@ -36,7 +36,7 @@ static String[] exchangeRoutingKeyFromTo(String to) {
         exRk[0] = EMPTY_STRING;
         exRk[1] = to.substring(QUEUE_DELIMITER_LENGTH);
       } else if (to.startsWith(EXCHANGE_DELIMITER)) {
-        int keyDelimiterIndex = to.indexOf(KEY_DELIMITER);
+        int keyDelimiterIndex = to.indexOf(KEY_DELIMITER, EXCHANGE_DELIMITER_LENGTH);
         exRk[0] =
             to.substring(
                 EXCHANGE_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("/exchange/foo%20bar");
+        .isEqualTo("/e/foo%20bar");
   }
 
   @Test
   void replyToShouldBePathEncoded() {
     assertThat(new AmqpMessage().replyToAddress().exchange("foo bar").message().replyTo())
-        .isEqualTo("/exchange/foo%20bar");
+        .isEqualTo("/e/foo%20bar");
   }
 }

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("/exchange/foo");
-    assertThat(b().exchange("foo").key("bar").address()).isEqualTo("/exchange/foo/key/bar");
-    assertThat(b().exchange("foo bar").address()).isEqualTo("/exchange/foo%20bar");
-    assertThat(b().exchange("foo").key("b ar").address()).isEqualTo("/exchange/foo/key/b%20ar");
-    assertThat(b().queue("foo").address()).isEqualTo("/queue/foo");
-    assertThat(b().queue("foo bar").address()).isEqualTo("/queue/foo%20bar");
+    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");
   }
 
   TestAddressBuilder b() {

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

@@ -97,20 +97,20 @@ void autoDeleteQueueIsDeletedAfterLastConsumerIsClosed() {
     recovery.queueDeclared(queue("q2"));
     recovery.queueDeclared(autoDeleteQueue("ad-q"));
 
-    recovery.consumerCreated(1, "/queue/q1");
-    recovery.consumerCreated(2, "/queue/q2");
-    recovery.consumerCreated(3, "/queue/ad-q");
-    recovery.consumerCreated(4, "/queue/ad-q");
+    recovery.consumerCreated(1, "/q/q1");
+    recovery.consumerCreated(2, "/q/q2");
+    recovery.consumerCreated(3, "/q/ad-q");
+    recovery.consumerCreated(4, "/q/ad-q");
 
     assertThat(recovery).hasQueueCount(3).hasQueues("q1", "q2", "ad-q");
 
-    recovery.consumerDeleted(1, "/queue/q1");
+    recovery.consumerDeleted(1, "/q/q1");
     assertThat(recovery).hasQueueCount(3).hasQueues("q1", "q2", "ad-q");
 
-    recovery.consumerDeleted(3, "/queue/ad-q");
+    recovery.consumerDeleted(3, "/q/ad-q");
     assertThat(recovery).hasQueueCount(3).hasQueues("q1", "q2", "ad-q");
 
-    recovery.consumerDeleted(4, "/queue/ad-q");
+    recovery.consumerDeleted(4, "/q/ad-q");
     assertThat(recovery).hasQueueCount(2).hasQueues("q1", "q2");
   }
 

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

@@ -27,7 +27,7 @@
 public class UtilsTest {
 
   @ParameterizedTest
-  @CsvSource({"/exchange/foo/bar,", "/topic/foo,", "/queue/foo,foo", "foo,"})
+  @CsvSource({"/e/foo/bar,", "/q/foo,foo", "foo,"})
   void extractQueueFromSourceAddress(String address, String expectedQueue) {
     assertThat(Utils.extractQueueFromSourceAddress(address)).isEqualTo(expectedQueue);
   }

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

@@ -27,12 +27,7 @@ public class UtilsTest {
 
   @ParameterizedTest
   @CsvSource(
-      value = {
-        "/exchange/foo/key/bar,foo,bar",
-        "/exchange/foo,foo,NULL",
-        "/queue/bar,'',bar",
-        "not a address,NULL,NULL"
-      },
+      value = {"/e/foo/bar,foo,bar", "/e/foo,foo,NULL", "/q/bar,'',bar", "not a address,NULL,NULL"},
       nullValues = "NULL")
   void testExchangeRoutingKeyFromTo(String to, String ex, String rk) {
     assertThat(exchangeRoutingKeyFromTo(to)).containsExactly(ex, rk);