TASK: Upgrade Flowpack/JobQueue 1.0

Author: dfeyer

Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Command/NodeIndexQueueCommandController.php

@@ -1,26 +1,17 @@
 <?php
 namespace Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\Command;
 
-use Doctrine\Common\Persistence\ObjectManager;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command\NodeIndexCommandController;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
 use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\Domain\Repository\NodeDataRepository;
 use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\IndexingJob;
 use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\UpdateAliasJob;
+use Flowpack\JobQueue\Common\Job\JobManager;
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Cli\CommandController;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
-use TYPO3\Flow\Configuration\ConfigurationManager;
-use TYPO3\Flow\Core\Booting\Scripts;
-use TYPO3\Flow\Exception;
 use TYPO3\Flow\Persistence\PersistenceManagerInterface;
-use TYPO3\Jobqueue\Common\Job\JobManager;
-use TYPO3\TYPO3CR\Domain\Factory\NodeFactory;
-use TYPO3\TYPO3CR\Domain\Model\NodeData;
-use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
 use TYPO3\TYPO3CR\Domain\Repository\WorkspaceRepository;
-use TYPO3\TYPO3CR\Search\Indexer\NodeIndexingManager;
 
 /**
  * Provides CLI features for index handling

Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/IndexingJob.php

@@ -2,12 +2,12 @@
 namespace Flowpack\ElasticSearch\ContentRepositoryQueueIndexer;
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer;
+use Flowpack\JobQueue\Common\Job\JobInterface;
+use Flowpack\JobQueue\Common\Queue\Message;
+use Flowpack\JobQueue\Common\Queue\QueueInterface;
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Log\SystemLoggerInterface;
 use TYPO3\Flow\Utility\Algorithms;
-use TYPO3\Jobqueue\Common\Job\JobInterface;
-use TYPO3\Jobqueue\Common\Queue\Message;
-use TYPO3\Jobqueue\Common\Queue\QueueInterface;
 use TYPO3\TYPO3CR\Domain\Factory\NodeFactory;
 use TYPO3\TYPO3CR\Domain\Model\NodeData;
 use TYPO3\TYPO3CR\Domain\Model\NodeInterface;

Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/UpdateAliasJob.php

@@ -3,16 +3,11 @@
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
+use Flowpack\JobQueue\Common\Job\JobInterface;
+use Flowpack\JobQueue\Common\Queue\Message;
+use Flowpack\JobQueue\Common\Queue\QueueInterface;
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Utility\Algorithms;
-use TYPO3\Jobqueue\Common\Job\JobInterface;
-use TYPO3\Jobqueue\Common\Queue\Message;
-use TYPO3\Jobqueue\Common\Queue\QueueInterface;
-use TYPO3\TYPO3CR\Domain\Factory\NodeFactory;
-use TYPO3\TYPO3CR\Domain\Model\NodeData;
-use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
-use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository;
-use TYPO3\TYPO3CR\Domain\Service\ContextFactory;
 
 /**
  * ElasticSearch Indexing Job Interface
@@ -43,8 +38,6 @@ class UpdateAliasJob implements JobInterface
 
     /**
      * @param string $indexPostfix
-     * @param string $workspaceName
-     * @param array $nodes
      */
     public function __construct($indexPostfix)
     {

Configuration/Settings.yaml

@@ -1,9 +1,9 @@
-TYPO3:
-  Jobqueue:
+Flowpack:
+  JobQueue:
     Common:
       queues:
         'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':
-          className: 'TYPO3\Jobqueue\Beanstalkd\Queue\BeanstalkdQueue'
+          className: 'Flowpack\JobQueue\Beanstalkd\Queue\BeanstalkdQueue'
           options:
             host: '127.0.0.1'
             port: 11300

composer.json

@@ -4,10 +4,9 @@
   "description": "Neos CMS ElasticSearch indexer based on beanstalkd (job queue)",
   "license": "MIT",
   "require": {
-    "typo3/jobqueue-common": "0.1.0",
-    "typo3/jobqueue-beanstalkd": "1.1.0",
-    "flowpack/elasticsearch-contentrepositoryadaptor": "^2.0.2",
-    "typo3/typo3cr-search": "^2.1.1"
+    "flowpack/jobqueue-beanstalkd": "^2.0.0",
+    "flowpack/elasticsearch-contentrepositoryadaptor": "^2.0.0",
+    "neos/content-repository-search": "^2.1.0"
   },
   "autoload": {
     "psr-0": {