rename

Author: dgafka

packages/Amqp/src/AmqpBackedMessageChannelBuilder.php

@@ -53,9 +53,9 @@ private function getAmqpOutboundChannelAdapter(): AmqpOutboundChannelAdapterBuil
         return $this->outboundChannelAdapter;
     }
 
-    public function withDeliveryGuarantee(bool $deliveryGuarantee): self
+    public function withPublisherAcknowledgments(bool $enabled): self
     {
-        $this->getAmqpOutboundChannelAdapter()->withDeliveryGuarantee($deliveryGuarantee);
+        $this->getAmqpOutboundChannelAdapter()->withPublisherAcknowledgments($enabled);
 
         return $this;
     }

packages/Amqp/src/AmqpOutboundChannelAdapter.php

@@ -31,17 +31,17 @@ class AmqpOutboundChannelAdapter implements MessageHandler
     private $initialized = false;
 
     public function __construct(
-        private CachedConnectionFactory $connectionFactory,
-        private AmqpAdmin $amqpAdmin,
-        private string $exchangeName,
-        private ?string $routingKey,
-        private ?string $routingKeyFromHeaderName,
-        private ?string $exchangeFromHeaderName,
-        private bool $defaultPersistentDelivery,
-        private bool $autoDeclare,
-        private bool $deliveryGuarantee,
-        private OutboundMessageConverter $outboundMessageConverter,
-        private ConversionService $conversionService,
+        private CachedConnectionFactory    $connectionFactory,
+        private AmqpAdmin                  $amqpAdmin,
+        private string                     $exchangeName,
+        private ?string                    $routingKey,
+        private ?string                    $routingKeyFromHeaderName,
+        private ?string                    $exchangeFromHeaderName,
+        private bool                       $defaultPersistentDelivery,
+        private bool                       $autoDeclare,
+        private bool                       $publisherAcknowledgments,
+        private OutboundMessageConverter   $outboundMessageConverter,
+        private ConversionService          $conversionService,
         private AmqpTransactionInterceptor $amqpTransactionInterceptor,
     ) {
     }
@@ -82,7 +82,7 @@ public function handle(Message $message): void
 
         /** @var AmqpContext $context */
         $context = $this->connectionFactory->createContext();
-        if ($this->deliveryGuarantee && !$this->amqpTransactionInterceptor->isRunningInTransaction()) {
+        if ($this->publisherAcknowledgments && !$this->amqpTransactionInterceptor->isRunningInTransaction()) {
             /** Ensures no messages are lost along the way when heartbeat is lost and ensures messages was peristed on the Broker side. Without this message can be simply "swallowed" without throwing exception */
             $context->getExtChannel()->confirmSelect();
         }
@@ -94,7 +94,7 @@ public function handle(Message $message): void
 //            this allow for having queue per delay instead of queue per delay + exchangeName
             ->send(new AmqpTopic($exchangeName), $messageToSend);
 
-        if ($this->deliveryGuarantee && !$this->amqpTransactionInterceptor->isRunningInTransaction()) {
+        if ($this->publisherAcknowledgments && !$this->amqpTransactionInterceptor->isRunningInTransaction()) {
             $context->getExtChannel()->waitForConfirm();
         }
     }

packages/Amqp/src/AmqpOutboundChannelAdapterBuilder.php

@@ -27,7 +27,7 @@ class AmqpOutboundChannelAdapterBuilder extends EnqueueOutboundChannelAdapterBui
     private string $exchangeName;
     private bool $defaultPersistentDelivery = self::DEFAULT_PERSISTENT_MODE;
     private array $staticHeadersToAdd = [];
-    private bool $deliveryGuarantee = true;
+    private bool $publisherAcknowledgments = true;
 
     private function __construct(string $exchangeName, string $amqpConnectionFactoryReferenceName)
     {
@@ -58,9 +58,9 @@ public function withDefaultRoutingKey(string $routingKey): self
         return $this;
     }
 
-    public function withDeliveryGuarantee(bool $deliveryGuarantee): self
+    public function withPublisherAcknowledgments(bool $publisherAcknowledgments): self
     {
-        $this->deliveryGuarantee = $deliveryGuarantee;
+        $this->publisherAcknowledgments = $publisherAcknowledgments;
 
         return $this;
     }
@@ -134,7 +134,7 @@ public function compile(MessagingContainerBuilder $builder): Definition
             $this->exchangeFromHeader,
             $this->defaultPersistentDelivery,
             $this->autoDeclare,
-            $this->deliveryGuarantee,
+            $this->publisherAcknowledgments,
             $outboundMessageConverter,
             new Reference(ConversionService::REFERENCE_NAME),
             Reference::to(AmqpTransactionInterceptor::class),

packages/Amqp/tests/Integration/AmqpMessageChannelTest.php

@@ -74,7 +74,7 @@ public function test_sending_and_receiving_without_delivery_guarantee()
                 ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::AMQP_PACKAGE]))
                 ->withExtensionObjects([
                     AmqpBackedMessageChannelBuilder::create($queueName)
-                        ->withDeliveryGuarantee(false),
+                        ->withPublisherAcknowledgments(false),
                 ])
         );