Encode path segments in address format

Author: acogoluegnes

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

@@ -17,6 +17,8 @@
 // [email protected].
 package com.rabbitmq.client.amqp.impl;
 
+import static com.rabbitmq.client.amqp.impl.UriUtils.encodePathSegment;
+
 import com.rabbitmq.client.amqp.AddressBuilder;
 
 abstract class DefaultAddressBuilder<T> implements AddressBuilder<T> {
@@ -57,12 +59,15 @@ public T queue(String queue) {
   String address() {
     if (this.exchange != null) {
       if (this.key != null && !this.key.isEmpty()) {
-        return "/exchange/" + this.exchange + "/key/" + this.key;
+        return "/exchange/"
+            + encodePathSegment(this.exchange)
+            + "/key/"
+            + encodePathSegment(this.key);
       } else {
-        return "/exchange/" + this.exchange;
+        return "/exchange/" + encodePathSegment(this.exchange);
       }
     } else if (this.queue != null) {
-      return "/queue/" + this.queue;
+      return "/queue/" + encodePathSegment(this.queue);
     } else {
       return null;
     }

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

@@ -0,0 +1,37 @@
+// Copyright (c) 2024 Broadcom. All Rights Reserved.
+// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// If you have any questions regarding licensing, please contact us at
+// [email protected].
+package com.rabbitmq.client.amqp.impl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class AmqpMessageTest {
+
+  @Test
+  void toShouldBePathEncoded() {
+    assertThat(new AmqpMessage().toAddress().exchange("foo bar").message().to())
+        .isEqualTo("/exchange/foo%20bar");
+  }
+
+  @Test
+  void replyToShouldBePathEncoded() {
+    assertThat(new AmqpMessage().replyToAddress().exchange("foo bar").message().replyTo())
+        .isEqualTo("/exchange/foo%20bar");
+  }
+}

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

@@ -0,0 +1,51 @@
+// Copyright (c) 2024 Broadcom. All Rights Reserved.
+// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// If you have any questions regarding licensing, please contact us at
+// [email protected].
+package com.rabbitmq.client.amqp.impl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+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");
+  }
+
+  TestAddressBuilder b() {
+    return new TestAddressBuilder();
+  }
+
+  private static class TestAddressBuilder extends DefaultAddressBuilder<TestAddressBuilder> {
+
+    TestAddressBuilder() {
+      super(null);
+    }
+
+    @Override
+    TestAddressBuilder result() {
+      return this;
+    }
+  }
+}

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

@@ -26,7 +26,7 @@
 public class UriUtilsTest {
 
   @ParameterizedTest
-  @CsvSource({"test,test", "foo bar,foo%20bar", "foo%bar,foo%25bar"})
+  @CsvSource({"test,test", "foo bar,foo%20bar", "foo%bar,foo%25bar", "/,%2F"})
   void encodePathSegmentTest(String segment, String expected) {
     assertThat(encodePathSegment(segment)).isEqualTo(expected);
   }