Encode non-unreserved characters in binding path segment

This is a special case for a path segment, because the names
of source and destination and the routing key are expected to
be fully percent-encoded, so that the broker can extract them
from the path segment.

Author: acogoluegnes

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

@@ -374,13 +374,13 @@ void unbind(
       String target =
           "/bindings/"
               + "src="
-              + UriUtils.encodePathSegment(source)
+              + UriUtils.encodeNonUnreserved(source)
               + ";"
               + destinationField
               + "="
-              + UriUtils.encodePathSegment(destination)
+              + UriUtils.encodeNonUnreserved(destination)
               + ";key="
-              + UriUtils.encodePathSegment(key)
+              + UriUtils.encodeNonUnreserved(key)
               + ";args=";
       delete(target, CODE_204);
     } else {

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

@@ -73,6 +73,10 @@ private UriUtils() {}
     QUERY_PARAM.clear('&');
   }
 
+  static String encodeNonUnreserved(String value) {
+    return encode(value, UNRESERVED);
+  }
+
   static String encodePathSegment(String segment) {
     return encode(segment, PCHAR);
   }
@@ -81,12 +85,12 @@ static String encodeParameter(String value) {
     return encode(value, QUERY_PARAM);
   }
 
-  private static String encode(String segment, BitSet safeCharacters) {
-    if (segment == null) {
+  private static String encode(String value, BitSet safeCharacters) {
+    if (value == null) {
       return null;
     }
     StringBuilder buf = new StringBuilder();
-    final CharBuffer cb = CharBuffer.wrap(segment);
+    final CharBuffer cb = CharBuffer.wrap(value);
     final ByteBuffer bb = StandardCharsets.UTF_8.encode(cb);
     while (bb.hasRemaining()) {
       final int b = bb.get() & 0xff;

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

@@ -138,14 +138,16 @@ void queueDeclareDeletePublishConsume(String subject) {
     "foo,true",
     "фообар,true",
     "фообар,false",
+    "фоо!бар,false",
+    "фоо!бар,true",
   })
   void binding(String prefix, boolean addBindingArguments, TestInfo info) {
     String e1 = prefix + "-" + TestUtils.name(info);
     String e2 = prefix + "-" + TestUtils.name(info);
     String q = prefix + "-" + TestUtils.name(info);
     String rk = prefix + "-" + "foo";
     Map<String, Object> bindingArguments =
-        addBindingArguments ? singletonMap("foo", "bar") : emptyMap();
+        addBindingArguments ? singletonMap("foo", prefix + "-bar") : emptyMap();
     Management management = connection.management();
     try {
       management.exchange().name(e1).type(DIRECT).declare();

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

@@ -17,8 +17,7 @@
 // [email protected].
 package com.rabbitmq.client.amqp.impl;
 
-import static com.rabbitmq.client.amqp.impl.UriUtils.encodeParameter;
-import static com.rabbitmq.client.amqp.impl.UriUtils.encodePathSegment;
+import static com.rabbitmq.client.amqp.impl.UriUtils.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.params.ParameterizedTest;
@@ -44,4 +43,16 @@ void encodePathSegmentTest(String segment, String expected) {
   void encodeParamTest(String param, String expected) {
     assertThat(encodeParameter(param)).isEqualTo(expected);
   }
+
+  @ParameterizedTest
+  @CsvSource({
+    "test,test",
+    "foobar,foobar",
+    "foo bar,foo%20bar",
+    "foo&bar,foo%26bar",
+    "foo*bar,foo%2Abar"
+  })
+  void encodeNonUnreservedTest(String param, String expected) {
+    assertThat(encodeNonUnreserved(param)).isEqualTo(expected);
+  }
 }