Merge pull request #81 from rabbitmq/unwrap-byte-array-from-binary-application-property

Unwrap byte array from binary application property

Author: acogoluegnes

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

@@ -284,7 +284,12 @@ public String replyToGroupId() {
 
   @Override
   public Object property(String key) {
-    return returnFromDelegate(m -> m.property(key));
+    Object value = returnFromDelegate(m -> m.property(key));
+    if (value instanceof Binary) {
+      return ((Binary) value).asByteArray();
+    } else {
+      return value;
+    }
   }
 
   @Override

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

@@ -23,7 +23,6 @@
 import com.rabbitmq.client.amqp.Message;
 import java.time.Duration;
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -245,9 +244,7 @@ MessageAssert hasCorrelationId(Object id) {
     }
 
     MessageAssert hasUserId(byte[] userId) {
-      isNotNull();
-      org.assertj.core.api.Assertions.assertThat(actual.userId()).isEqualTo(userId);
-      return this;
+      return hasField("user-id", actual.userId(), userId);
     }
 
     MessageAssert hasTo(String to) {
@@ -317,11 +314,11 @@ MessageAssert hasProperty(String key, Object value) {
       }
       isNotNull();
       hasProperty(key);
-      if (!value.equals(this.actual.property(key))) {
-        fail(
-            "Message should have property '%s = %s' but has '%s = %s'",
-            key, value, key, this.actual.property(key));
-      }
+      org.assertj.core.api.Assertions.assertThat(this.actual.property(key))
+          .describedAs(
+              "Message should have property '%s = %s' but has '%s = %s'",
+              key, value, key, this.actual.property(key))
+          .isEqualTo(value);
       return this;
     }
 
@@ -339,11 +336,11 @@ MessageAssert hasAnnotation(String key, Object value) {
       }
       isNotNull();
       hasAnnotation(key);
-      if (!value.equals(this.actual.annotation(key))) {
-        fail(
-            "Message should have annotation '%s = %s' but has '%s = %s'",
-            key, value, key, this.actual.annotation(key));
-      }
+      org.assertj.core.api.Assertions.assertThat(this.actual.annotation(key))
+          .describedAs(
+              "Message should have annotation '%s = %s' but has '%s = %s'",
+              key, value, key, this.actual.annotation(key))
+          .isEqualTo(value);
       return this;
     }
 
@@ -357,9 +354,9 @@ MessageAssert doesNotHaveAnnotation(String key) {
 
     private MessageAssert hasField(String fieldLabel, Object value, Object expected) {
       isNotNull();
-      if (!Objects.equals(value, expected)) {
-        fail("Field '%s' should be '%s' but is '%s'", fieldLabel, expected, value);
-      }
+      org.assertj.core.api.Assertions.assertThat(value)
+          .describedAs("Field '%s' should be '%s' but is '%s'", fieldLabel, expected, value)
+          .isEqualTo(expected);
       return this;
     }
   }

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

@@ -43,7 +43,6 @@
 import net.jqwik.api.arbitraries.ArrayArbitrary;
 import net.jqwik.api.arbitraries.IntegerArbitrary;
 import net.jqwik.api.arbitraries.StringArbitrary;
-import org.apache.qpid.protonj2.types.Binary;
 import org.apache.qpid.protonj2.types.Symbol;
 import org.junit.jupiter.api.*;
 
@@ -310,7 +309,7 @@ void filterExpressionApplicationProperties() {
     msgs.forEach(m -> assertThat(m).hasProperty("foo", uuid));
 
     msgs = consume(messageCount, options -> options.property("foo", binary));
-    msgs.forEach(m -> assertThat(m).hasProperty("foo", new Binary(binary)));
+    msgs.forEach(m -> assertThat(m).hasProperty("foo", binary));
 
     msgs = consume(messageCount, options -> options.property("foo", "baz"));
     msgs.forEach(m -> assertThat(m).hasProperty("foo", "baz"));