[client][bundle] Move client configuration to ClientFactory.

makasim · makasim · commit 5abf4dcf485a · 2018-10-18T18:36:32.000+03:00
diff --git a/pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php b/pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php
@@ -6,17 +6,14 @@
 use Enqueue\AsyncEventDispatcher\DependencyInjection\AsyncEventDispatcherExtension;
 use Enqueue\Client\CommandSubscriberInterface;
 use Enqueue\Client\TopicSubscriberInterface;
-use Enqueue\Client\TraceableProducer;
 use Enqueue\JobQueue\Job;
 use Enqueue\Symfony\DependencyInjection\ClientFactory;
 use Enqueue\Symfony\DependencyInjection\TransportFactory;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 final class EnqueueExtension extends Extension implements PrependExtensionInterface
@@ -38,62 +35,15 @@ public function load(array $configs, ContainerBuilder $container): void
             $this->setupAutowiringForProcessors($container);
 
             $loader->load('client.yml');
-            $loader->load('extensions/flush_spool_producer_extension.yml');
-            $loader->load('extensions/exclusive_command_extension.yml');
+
+            $clientConfig = $config['client'];
+            // todo
+            $clientConfig['transport'] = $config['transport'];
+            $clientConfig['consumption'] = $config['consumption'];
 
             $clientFactory = new ClientFactory('default');
-            $clientFactory->build($container, $config['client']);
+            $clientFactory->build($container, $clientConfig);
             $clientFactory->createDriver($container, $config['transport']);
-
-            $configDef = $container->getDefinition('enqueue.client.default.config');
-            $configDef->setArguments([
-                $config['client']['prefix'],
-                $config['client']['app_name'],
-                $config['client']['router_topic'],
-                $config['client']['router_queue'],
-                $config['client']['default_processor_queue'],
-                $config['client']['router_processor'],
-                // @todo should be driver options.
-                $config['transport'],
-            ]);
-
-            $container->setParameter('enqueue.client.default.router_processor', $config['client']['router_processor']);
-            $container->setParameter('enqueue.client.router_queue_name', $config['client']['router_queue']);
-            $container->setParameter('enqueue.client.default_queue_name', $config['client']['default_processor_queue']);
-
-            if ($config['client']['traceable_producer']) {
-                $container->register('enqueue.client.default.traceable_producer', TraceableProducer::class)
-                    ->setDecoratedService('enqueue.client.default.producer')
-                    ->setPublic(true)
-                    ->addArgument(new Reference('enqueue.client.default.traceable_producer.inner'))
-                ;
-
-                // todo do alias only for default transport
-                $container->setAlias(TraceableProducer::class, new Alias('enqueue.client.default.traceable_producer'));
-            }
-
-            if ($config['client']['redelivered_delay_time']) {
-                $loader->load('extensions/delay_redelivered_message_extension.yml');
-
-                $container->getDefinition('enqueue.client.default.delay_redelivered_message_extension')
-                    ->replaceArgument(1, $config['client']['redelivered_delay_time'])
-                ;
-            }
-
-            $locatorId = 'enqueue.locator';
-            if ($container->hasDefinition($locatorId)) {
-                $locator = $container->getDefinition($locatorId);
-                $locator->replaceArgument(0, array_replace($locator->getArgument(0), [
-                    'enqueue.client.default.queue_consumer' => new Reference('enqueue.client.default.queue_consumer'),
-                    'enqueue.client.default.driver' => new Reference('enqueue.client.default.driver'),
-                    'enqueue.client.default.delegate_processor' => new Reference('enqueue.client.default.delegate_processor'),
-                    'enqueue.client.default.producer' => new Reference('enqueue.client.default.producer'),
-                ]));
-            }
-
-            $container->getDefinition('enqueue.client.default.queue_consumer')
-                ->replaceArgument(4, $config['consumption']['receive_timeout'])
-            ;
         }
 
         if ($config['job']) {
diff --git a/pkg/enqueue-bundle/Resources/config/extensions/delay_redelivered_message_extension.yml b/pkg/enqueue-bundle/Resources/config/extensions/delay_redelivered_message_extension.yml
diff --git a/pkg/enqueue-bundle/Resources/config/extensions/doctrine_clear_identity_map_extension.yml b/pkg/enqueue-bundle/Resources/config/extensions/doctrine_clear_identity_map_extension.yml
@@ -1,8 +1,9 @@
 services:
     enqueue.consumption.doctrine_clear_identity_map_extension:
         class: 'Enqueue\Bundle\Consumption\Extension\DoctrineClearIdentityMapExtension'
-        public: false
         arguments:
             - '@doctrine'
         tags:
-            - { name: 'enqueue.consumption_extension', client: 'default' }
+            - { name: 'enqueue.consumption_extension', client: 'all' }
+            - { name: 'enqueue.transport.consumption_extension', transport: 'all' }
+
diff --git a/pkg/enqueue-bundle/Resources/config/extensions/doctrine_ping_connection_extension.yml b/pkg/enqueue-bundle/Resources/config/extensions/doctrine_ping_connection_extension.yml
@@ -1,8 +1,8 @@
 services:
     enqueue.consumption.doctrine_ping_connection_extension:
         class: 'Enqueue\Bundle\Consumption\Extension\DoctrinePingConnectionExtension'
-        public: false
         arguments:
             - '@doctrine'
         tags:
-            - { name: 'enqueue.consumption.extension', client: 'default' }
+            - { name: 'enqueue.consumption_extension', client: 'all' }
+            - { name: 'enqueue.transport.consumption_extension', transport: 'all' }
diff --git a/pkg/enqueue-bundle/Resources/config/extensions/exclusive_command_extension.yml b/pkg/enqueue-bundle/Resources/config/extensions/exclusive_command_extension.yml
diff --git a/pkg/enqueue-bundle/Resources/config/extensions/flush_spool_producer_extension.yml b/pkg/enqueue-bundle/Resources/config/extensions/flush_spool_producer_extension.yml
diff --git a/pkg/enqueue-bundle/Resources/config/extensions/reply_extension.yml b/pkg/enqueue-bundle/Resources/config/extensions/reply_extension.yml
@@ -1,6 +1,6 @@
 services:
     enqueue.consumption.reply_extension:
         class: 'Enqueue\Consumption\Extension\ReplyExtension'
-        public: false
         tags:
-            - { name: 'enqueue.consumption.extension', client: 'default' }
+            - { name: 'enqueue.consumption_extension', client: 'all' }
+            - { name: 'enqueue.transport.consumption_extension', transport: 'all' }
diff --git a/pkg/enqueue-bundle/Resources/config/extensions/signal_extension.yml b/pkg/enqueue-bundle/Resources/config/extensions/signal_extension.yml
@@ -1,6 +1,6 @@
 services:
     enqueue.consumption.signal_extension:
         class: 'Enqueue\Consumption\Extension\SignalExtension'
-        public: false
         tags:
-            - { name: 'enqueue.consumption.extension', client: 'default' }
+            - { name: 'enqueue.consumption_extension', client: 'all' }
+            - { name: 'enqueue.transport.consumption_extension', transport: 'all' }
diff --git a/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml b/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml
@@ -50,6 +50,10 @@ services:
         alias: 'enqueue.client.default.producer'
         public: true
 
+    test_enqueue.client.default.spool_producer:
+        alias: 'enqueue.client.default.spool_producer'
+        public: true
+
     test_Enqueue\Client\ProducerInterface:
         alias: 'Enqueue\Client\ProducerInterface'
         public: true
diff --git a/pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml b/pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml
@@ -19,6 +19,10 @@ services:
         alias: 'enqueue.client.default.driver'
         public: true
 
+    test_enqueue.client.default.producer:
+        alias: 'enqueue.client.default.producer'
+        public: true
+
     test_enqueue.transport.default.context:
         alias: 'enqueue.transport.default.context'
         public: true
diff --git a/pkg/enqueue-bundle/Tests/Functional/Client/SpoolProducerTest.php b/pkg/enqueue-bundle/Tests/Functional/Client/SpoolProducerTest.php
@@ -12,7 +12,7 @@ class SpoolProducerTest extends WebTestCase
 {
     public function testCouldBeGetFromContainerAsService()
     {
-        $producer = static::$container->get('enqueue.client.default.spool_producer');
+        $producer = static::$container->get('test_enqueue.client.default.spool_producer');
 
         $this->assertInstanceOf(SpoolProducer::class, $producer);
     }
diff --git a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
@@ -363,7 +363,7 @@ protected static function createKernel(array $options = []): CustomAppKernel
 
     private function getMessageProducer(): ProducerInterface
     {
-        return static::$container->get('enqueue.client.default.producer');
+        return static::$container->get('test_enqueue.client.default.producer');
     }
 
     private function getContext(): Context
diff --git a/pkg/enqueue/Symfony/DependencyInjection/ClientFactory.php b/pkg/enqueue/Symfony/DependencyInjection/ClientFactory.php
@@ -4,6 +4,9 @@
 
 use Enqueue\Client\ChainExtension;
 use Enqueue\Client\Config;
+use Enqueue\Client\ConsumptionExtension\DelayRedeliveredMessageExtension;
+use Enqueue\Client\ConsumptionExtension\ExclusiveCommandExtension;
+use Enqueue\Client\ConsumptionExtension\FlushSpoolProducerExtension;
 use Enqueue\Client\ConsumptionExtension\SetRouterPropertiesExtension;
 use Enqueue\Client\DelegateProcessor;
 use Enqueue\Client\DriverFactory;
@@ -13,6 +16,7 @@
 use Enqueue\Client\RouteCollection;
 use Enqueue\Client\RouterProcessor;
 use Enqueue\Client\SpoolProducer;
+use Enqueue\Client\TraceableProducer;
 use Enqueue\Consumption\ChainExtension as ConsumptionChainExtension;
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\Rpc\RpcFactory;
@@ -54,7 +58,21 @@ public function build(ContainerBuilder $container, array $config): void
             ->addArgument($this->reference('route_collection'))
         ;
 
-        $container->register($this->format('config'), Config::class);
+        $container->register($this->format('config'), Config::class)
+            ->setArguments([
+                $config['prefix'],
+                $config['app_name'],
+                $config['router_topic'],
+                $config['router_queue'],
+                $config['default_processor_queue'],
+                $config['router_processor'],
+                // @todo should be driver options.
+                $config['transport'],
+            ]);
+
+        $container->setParameter($this->format('router_processor'), $config['router_processor']);
+        $container->setParameter($this->format('router_queue_name'), $config['router_queue']);
+        $container->setParameter($this->format('default_queue_name'), $config['default_processor_queue']);
 
         $container->register($this->format('route_collection'), RouteCollection::class)
             ->addArgument([])
@@ -98,31 +116,59 @@ public function build(ContainerBuilder $container, array $config): void
             ->addArgument($this->reference('context'))
             ->addArgument($this->reference('consumption_extensions'))
             ->addArgument([])
-            ->addArgument(null)
-            ->addArgument(null)
-            ->addArgument(null)
+            ->addArgument($this->reference('logger', ContainerInterface::NULL_ON_INVALID_REFERENCE))
+            ->addArgument($config['consumption']['receive_timeout'])
         ;
 
-        $container->register($this->format('queue_consumer'), QueueConsumer::class)
-            ->addArgument($this->reference('context'))
-            ->addArgument($this->reference('consumption_extensions'))
+        $container->register($this->format('consumption_extensions'), ConsumptionChainExtension::class)
             ->addArgument([])
-            ->addArgument(new Reference('logger', ContainerInterface::NULL_ON_INVALID_REFERENCE))
         ;
 
-        $container->register($this->format('consumption_extensions'), ConsumptionChainExtension::class)
-            ->addArgument([])
+        $container->register($this->format('flush_spool_producer_extension'), FlushSpoolProducerExtension::class)
+            ->addArgument($this->reference('spool_producer'))
+            ->addTag('enqueue.consumption.extension', ['priority' => -100, 'client' => $this->name])
         ;
 
-        if ('default' === $this->name) {
-            $container->setAlias(ProducerInterface::class, $this->format('producer'))
-                ->setPublic(true)
+        $container->register($this->format('exclusive_command_extension'), ExclusiveCommandExtension::class)
+            ->addArgument($this->reference('driver'))
+            ->addTag('enqueue.consumption.extension', ['priority' => 100, 'client' => $this->name])
+        ;
+
+        if ($config['traceable_producer']) {
+            $container->register($this->format('traceable_producer'), TraceableProducer::class)
+                ->setDecoratedService($this->format('producer'))
+                ->addArgument($this->reference('traceable_producer.inner'))
+            ;
+        }
+
+        if ($config['redelivered_delay_time']) {
+            $container->register($this->format('delay_redelivered_message_extension'), DelayRedeliveredMessageExtension::class)
+                ->addArgument($this->reference('driver'))
+                ->addArgument($config['redelivered_delay_time'])
+                ->addTag('enqueue.consumption_extension', ['priority' => 10, 'client' => $this->name])
             ;
 
-            $container->setAlias(SpoolProducer::class, $this->format('spool_producer'))
-                ->setPublic(true)
+            $container->getDefinition('enqueue.client.default.delay_redelivered_message_extension')
+                ->replaceArgument(1, $config['redelivered_delay_time'])
             ;
         }
+
+        $locatorId = 'enqueue.locator';
+        if ($container->hasDefinition($locatorId)) {
+            $locator = $container->getDefinition($locatorId);
+            $locator->replaceArgument(0, array_replace($locator->getArgument(0), [
+                $this->format('queue_consumer') => $this->reference('queue_consumer'),
+                $this->format('driver') => $this->reference('driver'),
+                $this->format('delegate_processor') => $this->reference('delegate_processor'),
+                $this->format('producer') => $this->reference('producer'),
+            ]));
+        }
+
+        if ('default' === $this->name) {
+            $container->setAlias(ProducerInterface::class, $this->format('producer'));
+
+            $container->setAlias(SpoolProducer::class, $this->format('spool_producer'));
+        }
     }
 
     public function createDriver(ContainerBuilder $container, array $config): string
diff --git a/pkg/enqueue/Symfony/DependencyInjection/FormatClientNameTrait.php b/pkg/enqueue/Symfony/DependencyInjection/FormatClientNameTrait.php
@@ -2,15 +2,16 @@
 
 namespace Enqueue\Symfony\DependencyInjection;
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Reference;
 
 trait FormatClientNameTrait
 {
     abstract protected function getName(): string;
 
-    private function reference(string $serviceName): Reference
+    private function reference(string $serviceName, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE): Reference
     {
-        return new Reference($this->format($serviceName));
+        return new Reference($this->format($serviceName), $invalidBehavior);
     }
 
     private function parameter(string $serviceName): string
diff --git a/pkg/enqueue/Tests/Symfony/DependencyInjection/TransportFactoryTest.php b/pkg/enqueue/Tests/Symfony/DependencyInjection/TransportFactoryTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Reference;
 
 class TransportFactoryTest extends TestCase
@@ -388,7 +389,7 @@ public function testShouldBuildQueueConsumerWithDefaultOptions()
             new Reference('enqueue.transport.default.context'),
             new Reference('enqueue.transport.default.consumption_extensions'),
             [],
-            null,
+            new Reference('logger', ContainerInterface::NULL_ON_INVALID_REFERENCE),
             '%enqueue.transport.default.receive_timeout%',
         ], $container->getDefinition('enqueue.transport.default.queue_consumer')->getArguments());
     }
