Add yadm store, hydrator, simple and bundle resource and model storages.

Author: makasim

DI/QuartzConfiguration.php

@@ -7,27 +7,33 @@
 
 class QuartzConfiguration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $tb = new TreeBuilder();
         $rootNode = $tb->root('quartz');
 
         $rootNode->children()
-            ->arrayNode('store')->addDefaultsIfNotSet()->children()
+            ->arrayNode('yadm_simple_store')->children()
                 ->scalarNode('uri')->defaultValue('mongodb://localhost:27017')->end()
                 ->variableNode('uriOptions')->defaultValue([])->end()
                 ->variableNode('driverOptions')->defaultValue([])->end()
                 ->scalarNode('sessionId')->defaultValue('quartz')->end()
                 ->scalarNode('dbName')->defaultValue(null)->end()
-                ->scalarNode('managementLockCol')->defaultValue('managementLock')->end()
-                ->scalarNode('calendarCol')->defaultValue('calendar')->end()
-                ->scalarNode('triggerCol')->defaultValue('trigger')->end()
-                ->scalarNode('firedTriggerCol')->defaultValue('firedTrigger')->end()
-                ->scalarNode('jobCol')->defaultValue('job')->end()
-                ->scalarNode('pausedTriggerCol')->defaultValue('pausedTrigger')->end()
+                ->scalarNode('managementLockCol')->defaultValue('quartz_management_lock')->end()
+                ->scalarNode('calendarCol')->defaultValue('quartz_calendar')->end()
+                ->scalarNode('triggerCol')->defaultValue('quartz_trigger')->end()
+                ->scalarNode('firedTriggerCol')->defaultValue('quartz_fired_trigger')->end()
+                ->scalarNode('jobCol')->defaultValue('quartz_job')->end()
+                ->scalarNode('pausedTriggerCol')->defaultValue('quartz_paused_trigger')->end()
+            ->end()->end()
+            ->arrayNode('yadm_bundle_store')->children()
+                ->scalarNode('sessionId')->defaultValue('quartz')->end()
+                ->scalarNode('managementLockCol')->defaultValue('quartz_management_lock')->end()
+                ->scalarNode('calendarStorage')->defaultValue('quartz_calendar')->end()
+                ->scalarNode('triggerStorage')->defaultValue('quartz_trigger')->end()
+                ->scalarNode('firedTriggerStorage')->defaultValue('quartz_fired_trigger')->end()
+                ->scalarNode('jobStorage')->defaultValue('quartz_job')->end()
+                ->scalarNode('pausedTriggerStorage')->defaultValue('quartz_paused_trigger')->end()
             ->end()->end()
             ->integerNode('misfireThreshold')->min(10)->defaultValue(60)->end()
         ;

DI/QuartzExtension.php

@@ -7,12 +7,13 @@
 use Quartz\Bridge\Scheduler\EnqueueJobRunShell;
 use Quartz\Bridge\Scheduler\JobRunShellProcessor;
 use Quartz\Bridge\Scheduler\RpcProtocol;
+use Quartz\Bridge\Yadm\BundleStoreResource;
+use Quartz\Bridge\Yadm\SimpleStoreResource;
+use Quartz\Bridge\Yadm\YadmStore;
 use Quartz\Core\SimpleJobFactory;
 use Quartz\Scheduler\StdJobRunShell;
 use Quartz\Scheduler\StdJobRunShellFactory;
 use Quartz\Scheduler\StdScheduler;
-use Quartz\Scheduler\Store\YadmStore;
-use Quartz\Scheduler\Store\YadmStoreResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Reference;
@@ -47,12 +48,30 @@ public function load(array $configs, ContainerBuilder $container)
     {
         $config = $this->processConfiguration(new QuartzConfiguration(), $configs);
 
-        $container->register($this->format('store_resource'), YadmStoreResource::class)
-            ->setArguments([$config['store']])
-        ;
+        if (false == empty($config['yadm_simple_store']) && false == empty($config['yadm_bundle_store'])) {
+            throw new \LogicException('Either yadm_simple_store or yadm_bundle_store must be set. Both are set');  
+        }
+        if (empty($config['yadm_simple_store']) && empty($config['yadm_bundle_store'])) {
+            throw new \LogicException('Either yadm_simple_store or yadm_bundle_store must be set. None is set');
+        }
+
+        if (false == empty($config['yadm_simple_store'])) {
+            $container->register($this->format('store_resource'), SimpleStoreResource::class)
+                ->addArgument($config['yadm_simple_store'])
+            ;
+        }
+
+        if (false == empty($config['yadm_bundle_store'])) {
+            $container->register($this->format('store_resource'), BundleStoreResource::class)
+                ->addArgument(new Reference('yadm.client_provider'))
+                ->addArgument(new Reference('yadm.collection_factory'))
+                ->addArgument(new Reference('yadm'))
+                ->addArgument($config['yadm_bundle_store'])
+            ;
+        }
 
         $container->register($this->format('store'), YadmStore::class)
-            ->setArguments([new Reference($this->format('store_resource'))])
+            ->addArgument(new Reference($this->format('store_resource')))
             ->addMethodCall('setMisfireThreshold', [$config['misfireThreshold']])
         ;
 

Scheduler/SchedulerFactory.php

@@ -5,15 +5,15 @@
 use Quartz\Bridge\Enqueue\EnqueueRemoteTransport;
 use Quartz\Bridge\Enqueue\EnqueueRemoteTransportProcessor;
 use Quartz\Bridge\Enqueue\EnqueueResponseJob;
+use Quartz\Bridge\Yadm\SimpleStoreResource;
+use Quartz\Bridge\Yadm\YadmStore;
 use Quartz\Core\Scheduler;
 use Quartz\Core\SchedulerFactory as BaseSchedulerFactory;
 use Quartz\Core\SimpleJobFactory;
 use Quartz\Scheduler\JobRunShellFactory;
 use Quartz\Scheduler\StdJobRunShell;
 use Quartz\Scheduler\StdJobRunShellFactory;
 use Quartz\Scheduler\StdScheduler;
-use Quartz\Scheduler\Store\YadmStore;
-use Quartz\Scheduler\Store\YadmStoreResource;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class SchedulerFactory implements BaseSchedulerFactory
@@ -134,7 +134,7 @@ public function getStore()
     {
         if (null == $this->store) {
             $config = isset($this->config['store']) ? $this->config['store'] : [];
-            $this->store = new YadmStore(new YadmStoreResource($config));
+            $this->store = new YadmStore(new SimpleStoreResource($config));
         }
 
         return $this->store;

Tests/Scheduler/JobRunShellProcessorTest.php

@@ -10,8 +10,8 @@
 use Interop\Queue\Processor;
 use PHPUnit\Framework\TestCase;
 use Quartz\Bridge\Scheduler\JobRunShellProcessor;
+use Quartz\Bridge\Yadm\YadmStore;
 use Quartz\Scheduler\StdJobRunShell;
-use Quartz\Scheduler\Store\YadmStore;
 use Quartz\Triggers\SimpleTrigger;
 
 class JobRunShellProcessorTest extends TestCase