NGSTACK-836: rename parent child indexing to descendant indexing

netgen · Jun 10, 2024 · 88b873c · 88b873c
1 parent 9980813
commit 88b873c
Show file tree

Hide file tree

Showing 19 changed files with 140 additions and 140 deletions.
diff --git a/bundle/DependencyInjection/NetgenIbexaSearchExtraExtension.php b/bundle/DependencyInjection/NetgenIbexaSearchExtraExtension.php
@@ -122,7 +122,7 @@ private function processAsynchronousIndexingConfiguration(array $configuration,
     private function processParentChildIndexingConfiguration(array $configuration, ContainerBuilder $container): void
     {
         $container->setParameter(
-            'netgen.ibexa_search_extra.parent_child_indexing.configuration',
+            'netgen.ibexa_search_extra.descendant_indexing.configuration',
             $configuration['hierarchical_indexing']['descendant_indexing'],
         );
     }

diff --git a/bundle/NetgenIbexaSearchExtraBundle.php b/bundle/NetgenIbexaSearchExtraBundle.php
@@ -22,7 +22,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new Compiler\AggregateFacetBuilderVisitorPass());
         $container->addCompilerPass(new Compiler\AggregateSubdocumentQueryCriterionVisitorPass());
         $container->addCompilerPass(new Compiler\AsynchronousIndexingPass());
-        $container->addCompilerPass(new Compiler\ParentChildIndexingPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);
+        $container->addCompilerPass(new Compiler\DescendantIndexingPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);
         $container->addCompilerPass(new Compiler\FieldType\RichTextIndexablePass());
         $container->addCompilerPass(new Compiler\SearchResultExtractorPass());
         $container->addCompilerPass(new Compiler\RawFacetBuilderDomainVisitorPass());

diff --git a/...iner/Compiler/ParentChildIndexingPass.php → ...ainer/Compiler/DescendantIndexingPass.php b/...iner/Compiler/ParentChildIndexingPass.php → ...ainer/Compiler/DescendantIndexingPass.php
@@ -8,17 +8,17 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class ParentChildIndexingPass implements CompilerPassInterface
+class DescendantIndexingPass implements CompilerPassInterface
 {
-    private const ParentChildConfigurationParameter = 'netgen.ibexa_search_extra.parent_child_indexing.configuration';
-    private const ParentChildMessageHandlerTag = 'netgen.ibexa_search_extra.parent_child_indexing.message_handler';
+    private const ParentChildConfigurationParameter = 'netgen.ibexa_search_extra.descendant_indexing.configuration';
+    private const ParentChildMessageHandlerTag = 'netgen.ibexa_search_extra.descendant_indexing.message_handler';
     private const MessageHandlerTag = 'messenger.message_handler';
-    private const ParentChildSolrContentFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.parent_child_indexing.content';
-    private const ParentChildSolrContentFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.parent_child_indexing.content';
-    private const ParentChildSolrContentTranslationFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.parent_child_indexing.content.translation';
-    private const ParentChildSolrContentTranslationFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.parent_child_indexing.content.translation';
-    private const ParentChildSolrLocationFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.parent_child_indexing.location';
-    private const ParentChildSolrLocationFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.parent_child_indexing.location';
+    private const ParentChildSolrContentFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content';
+    private const ParentChildSolrContentFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content';
+    private const ParentChildSolrContentTranslationFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation';
+    private const ParentChildSolrContentTranslationFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation';
+    private const ParentChildSolrLocationFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.location';
+    private const ParentChildSolrLocationFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.location';
 
     public function process(ContainerBuilder $container): void
     {

diff --git a/...Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldMapper.php b/...Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldMapper.php
@@ -79,7 +79,7 @@ public function mapFields(SPIContent $content, $languageCode): array
 
     public function getIdentifier(): string
     {
-        return 'ng_parent_child_indexing_fulltext';
+        return 'ng_descendant_indexing_fulltext';
     }
 
     /**

diff --git a/lib/Resources/config/search/common.yaml b/lib/Resources/config/search/common.yaml
@@ -1,4 +1,4 @@
 imports:
     - { resource: common/asynchronous_indexing.yaml }
     - { resource: common/field_value_mappers.yaml }
-    - { resource: common/parent_child_indexing.yaml }
+    - { resource: common/descendant_indexing.yaml }
diff --git a/lib/Resources/config/search/common/descendant_indexing.yaml b/lib/Resources/config/search/common/descendant_indexing.yaml
@@ -0,0 +1,10 @@
+imports:
+    - { resource: descendant_indexing/common.yaml }
+    - { resource: descendant_indexing/content.yaml }
+    - { resource: descendant_indexing/location.yaml }
+    - { resource: descendant_indexing/object_state.yaml }
+    - { resource: descendant_indexing/section.yaml }
+    - { resource: descendant_indexing/trash.yaml }
+
+parameters:
+    netgen.ibexa_search_extra.descendant_indexing.configuration: []
diff --git a/.../common/parent_child_indexing/common.yaml → ...ch/common/descendant_indexing/common.yaml b/.../common/parent_child_indexing/common.yaml → ...ch/common/descendant_indexing/common.yaml
@@ -1,20 +1,20 @@
 services:
-    netgen.ibexa_search_extra.parent_child_indexing.ancestor_path_generator:
+    netgen.ibexa_search_extra.descendant_indexing.ancestor_path_generator:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorPathGenerator
         arguments:
-            - '%netgen.ibexa_search_extra.parent_child_indexing.configuration%'
+            - '%netgen.ibexa_search_extra.descendant_indexing.configuration%'
 
-    netgen.ibexa_search_extra.parent_child_indexing.ancestor_resolver:
+    netgen.ibexa_search_extra.descendant_indexing.ancestor_resolver:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorResolver
         arguments:
             - '@Ibexa\Core\Persistence\Legacy\Content\Handler'
             - '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler'
             - '@Ibexa\Core\Persistence\Cache\LocationHandler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_path_generator'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_path_generator'
 
-    netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer:
+    netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer
         arguments:
             - '@Ibexa\Contracts\Core\Search\VersatileHandler'
             - '@Ibexa\Core\Persistence\Legacy\Content\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_resolver'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_resolver'
diff --git a/...common/parent_child_indexing/content.yaml → ...h/common/descendant_indexing/content.yaml b/...common/parent_child_indexing/content.yaml → ...h/common/descendant_indexing/content.yaml
@@ -1,64 +1,64 @@
 services:
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.copy_content:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.copy_content:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\CopyContentHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.delete_content:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.delete_content:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteContentHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.delete_translation:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.delete_translation:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteTranslationHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Handler'
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.hide_content:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.hide_content:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\HideContentHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.publish_version:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.publish_version:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\PublishVersionHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.reveal_content:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.reveal_content:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\RevealContentHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.update_content_metadata:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.update_content_metadata:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\UpdateContentMetadataHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Handler'
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
diff --git a/...ommon/parent_child_indexing/location.yaml → .../common/descendant_indexing/location.yaml b/...ommon/parent_child_indexing/location.yaml → .../common/descendant_indexing/location.yaml
@@ -1,90 +1,90 @@
 services:
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.assign_section_to_subtree:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.assign_section_to_subtree:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\AssignSectionToSubtreeHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.copy_subtree:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.copy_subtree:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CopySubtreeHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.create_location:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.create_location:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CreateLocationHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.delete_location:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.delete_location:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\DeleteLocationHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.hide_location:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.hide_location:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\HideLocationHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.move_subtree:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.move_subtree:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\MoveSubtreeHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.swap_location:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.swap_location:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\SwapLocationHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.unhide_location:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.unhide_location:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UnhideLocationHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }
 
-    netgen.ibexa_search_extra.parent_child_indexing.message_handler.update_location:
+    netgen.ibexa_search_extra.descendant_indexing.message_handler.update_location:
         class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UpdateLocationHandler
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
-            - '@netgen.ibexa_search_extra.parent_child_indexing.ancestor_indexer'
+            - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer'
             - '@?logger'
         tags:
-            - { name: netgen.ibexa_search_extra.parent_child_indexing.message_handler }
+            - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler }
             - { name: monolog.logger, channel: ngsearchextra }