[client] Move services definition to ClientFactory.

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,61 +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, $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']) {

pkg/enqueue-bundle/Resources/config/client.yml

@@ -1,83 +1,4 @@
 services:
-services:
-    enqueue.client.default.context:
-        class: 'Interop\Queue\Context'
-        factory: ['@enqueue.client.default.driver', 'getContext']
-
-    enqueue.client.default.driver_factory:
-        class: 'Enqueue\Client\DriverFactory'
-        arguments:
-            - '@enqueue.client.default.config'
-            - '@enqueue.client.default.route_collection'
-
-    enqueue.client.default.config:
-        class: 'Enqueue\Client\Config'
-
-    enqueue.client.default.route_collection:
-        class: 'Enqueue\Client\RouteCollection'
-        factory: ['Enqueue\Client\RouteCollection', 'fromArray']
-        arguments:
-            - []
-
-    enqueue.client.default.producer:
-        class: 'Enqueue\Client\Producer'
-        public: true
-        arguments:
-            - '@enqueue.client.default.driver'
-            - '@enqueue.client.default.rpc_factory'
-            - '@enqueue.client.default.client_extensions'
-
-    enqueue.client.default.spool_producer:
-        class: 'Enqueue\Client\SpoolProducer'
-        public: true
-        arguments:
-            - '@enqueue.client.default.producer'
-
-    enqueue.client.default.client_extensions:
-        class: 'Enqueue\Client\ChainExtension'
-        arguments:
-            - []
-
-    enqueue.client.default.rpc_factory:
-        class: 'Enqueue\Rpc\RpcFactory'
-        arguments:
-            - '@enqueue.client.default.context'
-
-    enqueue.client.default.router_processor:
-        class: 'Enqueue\Client\RouterProcessor'
-        arguments:
-            - '@enqueue.client.default.driver'
-
-    enqueue.client.default.processor_registry:
-        class: 'Enqueue\Symfony\ContainerProcessorRegistry'
-
-    enqueue.client.default.delegate_processor:
-        class: 'Enqueue\Client\DelegateProcessor'
-        arguments:
-            - '@enqueue.client.default.processor_registry'
-
-    enqueue.client.default.set_router_properties_extension:
-        class: 'Enqueue\Client\ConsumptionExtension\SetRouterPropertiesExtension'
-        arguments:
-            - '@enqueue.client.default.driver'
-        tags:
-            - { name: 'enqueue.consumption_extension', priority: 100, client: 'default' }
-
-    enqueue.client.default.queue_consumer:
-        class: 'Enqueue\Consumption\QueueConsumer'
-        arguments:
-            - '@enqueue.client.default.context'
-            - '@enqueue.client.default.consumption_extensions'
-            - []
-            - null
-            - ~
-            - ~
-
-    enqueue.client.default.consumption_extensions:
-        class: 'Enqueue\Consumption\ChainExtension'
-        arguments:
-            - []
-
     # todo
     enqueue.profiler.message_queue_collector:
         class: 'Enqueue\Bundle\Profiler\MessageQueueCollector'
@@ -86,17 +7,10 @@ services:
         tags:
             - { name: 'data_collector', template: '@Enqueue/Profiler/panel.html.twig', id: 'enqueue.message_queue' }
 
+    # todo
     enqueue.client.default.flush_spool_producer_listener:
         class: 'Enqueue\Symfony\Client\FlushSpoolProducerListener'
         arguments:
             - '@enqueue.client.default.spool_producer'
         tags:
             - { name: 'kernel.event_subscriber' }
-
-    Enqueue\Client\ProducerInterface:
-        public: true
-        alias: 'enqueue.client.default.producer'
-
-    Enqueue\Client\SpoolProducer:
-        public: true
-        alias: 'enqueue.client.default.spool_producer'

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' }
+

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' }

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' }

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' }

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

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

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);
     }

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