remove types

Elasticsearch 7 and FOSElasticaBundle 6 no longer use types (only indexes)

Author: AlexeyKosov

DependencyInjection/Configuration.php

@@ -38,7 +38,6 @@ public function getConfigTreeBuilder()
                                     ->booleanNode('remove')->defaultTrue()->end()
                                     ->scalarNode('connection')->defaultValue('default')->cannotBeEmpty()->end()
                                     ->scalarNode('index_name')->isRequired()->cannotBeEmpty()->end()
-                                    ->scalarNode('type_name')->isRequired()->cannotBeEmpty()->end()
                                     ->scalarNode('model_class')->isRequired()->cannotBeEmpty()->end()
                                     ->scalarNode('model_id')->defaultValue('id')->cannotBeEmpty()->end()
                                     ->scalarNode('repository_method')->defaultValue('find')->cannotBeEmpty()->end()

DependencyInjection/EnqueueElasticaExtension.php

@@ -67,9 +67,8 @@ public function load(array $configs, ContainerBuilder $container)
 
             foreach ($config['doctrine']['queue_listeners'] as $listenerConfig) {
                 $listenerId = sprintf(
-                    'enqueue_elastica.doctrine_queue_listener.%s.%s',
-                    $listenerConfig['index_name'],
-                    $listenerConfig['type_name']
+                    'enqueue_elastica.doctrine_queue_listener.%s',
+                    $listenerConfig['index_name']
                 );
 
                 $container->register($listenerId, SyncIndexWithObjectChangeListener::class)

Doctrine/Queue/SyncIndexWithObjectChangeProcessor.php

@@ -49,9 +49,6 @@ public function process(Message $message, Context $context): Result
         if (false == isset($data['index_name'])) {
             return Result::reject('The message data misses index_name');
         }
-        if (false == isset($data['type_name'])) {
-            return Result::reject('The message data misses type_name');
-        }
         if (false == isset($data['repository_method'])) {
             return Result::reject('The message data misses repository_method');
         }
@@ -60,11 +57,10 @@ public function process(Message $message, Context $context): Result
         $modelClass = $data['model_class'];
         $id = $data['id'];
         $index = $data['index_name'];
-        $type = $data['type_name'];
         $repositoryMethod = $data['repository_method'];
 
         $repository = $this->doctrine->getManagerForClass($modelClass)->getRepository($modelClass);
-        $persister = $this->persisterRegistry->getPersister($index, $type);
+        $persister = $this->persisterRegistry->getPersister($index);
 
         switch ($action) {
             case self::UPDATE_ACTION:
@@ -75,7 +71,7 @@ public function process(Message $message, Context $context): Result
                 }
 
                 if ($persister->handlesObject($object)) {
-                    if ($this->indexable->isObjectIndexable($index, $type, $object)) {
+                    if ($this->indexable->isObjectIndexable($index, $object)) {
                         $persister->replaceOne($object);
                     } else {
                         $persister->deleteOne($object);
@@ -90,7 +86,7 @@ public function process(Message $message, Context $context): Result
                     return Result::ack(sprintf('The object "%s" with id "%s" could not be found.', $modelClass, $id));
                 }
 
-                if ($persister->handlesObject($object) && $this->indexable->isObjectIndexable($index, $type, $object)) {
+                if ($persister->handlesObject($object) && $this->indexable->isObjectIndexable($index, $object)) {
                     $persister->insertOne($object);
                 }
 

Doctrine/SyncIndexWithObjectChangeListener.php

@@ -100,7 +100,6 @@ private function sendUpdateIndexMessage($action, $id)
             'model_id' => $this->config['model_id'],
             'id' => $id,
             'index_name' => $this->config['index_name'],
-            'type_name' => $this->config['type_name'],
             'repository_method' => $this->config['repository_method'],
         ]));
 

Persister/QueuePagerPersister.php

@@ -54,7 +54,7 @@ public function insert(PagerInterface $pager, array $options = array())
 
         $pager->setCurrentPage($options['first_page']);
 
-        $objectPersister = $this->registry->getPersister($options['indexName'], $options['typeName']);
+        $objectPersister = $this->registry->getPersister($options['indexName']);
 
         $event = new PrePersistEvent($pager, $objectPersister, $options);
         $this->dispatcher->dispatch($event);

Queue/PopulateProcessor.php

@@ -48,15 +48,12 @@ public function process(Message $message, Context $context): Result
             if (!isset($data['options']['indexName'])) {
                 return Result::reply($this->createReplyMessage($context, $message, 0,'The message is invalid. Missing indexName option.'));
             }
-            if (!isset($data['options']['typeName'])) {
-                return Result::reply($this->createReplyMessage($context, $message, 0,'The message is invalid. Missing typeName option.'));
-            }
 
             $options = $data['options'];
             $options['first_page'] = $data['page'];
             $options['last_page'] = $data['page'];
 
-            $provider = $this->pagerProviderRegistry->getProvider($options['indexName'], $options['typeName']);
+            $provider = $this->pagerProviderRegistry->getProvider($options['indexName']);
             $pager = $provider->provide($options);
             $pager->setMaxPerPage($options['max_per_page']);
             $pager->setCurrentPage($options['first_page']);