Revert "use a property for the messageId"

This reverts commit f2bd9db.

Author: Benoît Lévêque

pkg/sqs/SqsMessage.php

@@ -58,11 +58,6 @@ class SqsMessage implements Message
      */
     private $requeueVisibilityTimeout;
 
-    /**
-     * @var string|null
-     */
-    private $messageId;
-
     public function __construct(string $body = '', array $properties = [], array $headers = [])
     {
         $this->body = $body;
@@ -171,12 +166,12 @@ public function getCorrelationId(): ?string
 
     public function setMessageId(string $messageId = null): void
     {
-        $this->messageId = $messageId;
+        $this->setHeader('message_id', $messageId);
     }
 
     public function getMessageId(): ?string
     {
-        return $this->messageId;
+        return $this->getHeader('message_id');
     }
 
     public function getTimestamp(): ?int

pkg/sqs/Tests/Functional/SqsCommonUseCasesTest.php

@@ -102,7 +102,7 @@ public function testProduceAndReceiveOneMessageSentDirectlyToQueue()
 
         $this->assertEquals(__METHOD__, $message->getBody());
         $this->assertEquals(['FooProperty' => 'FooVal'], $message->getProperties());
-        $this->assertEquals(['BarHeader' => 'BarVal'], $message->getHeaders());
+        $this->assertEquals('BarVal', $message->getHeaders()['BarHeader']);
         $this->assertNotNull($message->getMessageId());
     }
 

pkg/sqs/Tests/SqsConsumerTest.php

@@ -338,7 +338,7 @@ public function testShouldReceiveMessage()
 
         $this->assertInstanceOf(SqsMessage::class, $result);
         $this->assertEquals('The Body', $result->getBody());
-        $this->assertEquals(['hkey' => 'hvalue'], $result->getHeaders());
+        $this->assertEquals(['hkey' => 'hvalue', 'message_id' => 'theMessageId'], $result->getHeaders());
         $this->assertEquals(['key' => 'value'], $result->getProperties());
         $this->assertEquals([
             'SenderId' => 'AROAX5IAWYILCTYIS3OZ5:[email protected]',