Refactor the InteropStamp logic

Author: KonstantinCodes

EnvelopeItem/InteropMessageStamp.php

@@ -12,9 +12,9 @@
 namespace Enqueue\MessengerAdapter\EnvelopeItem;
 
 use Interop\Queue\Message;
-use Symfony\Component\Messenger\Stamp\StampInterface;
+use Symfony\Component\Messenger\Stamp\NonSendableStampInterface;
 
-final class InteropMessageStamp implements StampInterface
+final class InteropMessageStamp implements NonSendableStampInterface
 {
     /** @var Message */
     private $message;

QueueInteropTransport.php

@@ -17,6 +17,7 @@
 use Enqueue\MessengerAdapter\EnvelopeItem\InteropMessageStamp;
 use Interop\Queue\Consumer;
 use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Exception\LogicException;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
 use Interop\Queue\Exception as InteropQueueException;
@@ -78,16 +79,13 @@ public function get(): iterable
             throw $e;
         }
 
-        /** @var Envelope $envelope */
         $envelope = $this->serializer->decode(array(
             'body' => $interopMessage->getBody(),
             'headers' => $interopMessage->getHeaders(),
             'properties' => $interopMessage->getProperties(),
         ));
 
-        if ($envelope) {
-            $envelope = $envelope->with(new InteropMessageStamp($interopMessage));
-        }
+        $envelope = $envelope->with(new InteropMessageStamp($interopMessage));
 
         return array($envelope);
     }
@@ -97,7 +95,7 @@ public function get(): iterable
      */
     public function ack(Envelope $envelope): void
     {
-        $interopMessage = $this->encodeMessage($envelope);
+        $interopMessage = $this->findMessage($envelope);
 
         $this->getConsumer()->acknowledge($interopMessage);
     }
@@ -107,7 +105,7 @@ public function ack(Envelope $envelope): void
      */
     public function reject(Envelope $envelope): void
     {
-        $interopMessage = $this->encodeMessage($envelope);
+        $interopMessage = $this->findMessage($envelope);
 
         $this->getConsumer()->reject($interopMessage);
     }
@@ -223,13 +221,6 @@ private function setMessageMetadata(Message $interopMessage, Envelope $envelope)
 
     private function encodeMessage(Envelope $envelope): Message
     {
-        /** @var InteropMessageStamp $interopStamp */
-        $interopStamp = $envelope->last(InteropMessageStamp::class);
-
-        if ($interopStamp) {
-            return $interopStamp->getMessage();
-        }
-
         $context = $this->contextManager->context();
         $encodedMessage = $this->serializer->encode($envelope);
 
@@ -242,6 +233,18 @@ private function encodeMessage(Envelope $envelope): Message
         return $interopMessage;
     }
 
+    private function findMessage(Envelope $envelope): Message
+    {
+        /** @var InteropMessageStamp $interopStamp */
+        $interopStamp = $envelope->last(InteropMessageStamp::class);
+
+        if (null === $interopStamp) {
+            throw new LogicException('No InteropMessageStamp found in the Envelope.');
+        }
+
+        return $interopStamp->getMessage();
+    }
+
     private function getConsumer(): Consumer
     {
         $context = $this->contextManager->context();