NGSTACK-836: restructure parent-child indexing field mapper

netgen · May 29, 2024 · ebafc0a · ebafc0a
1 parent 4df4ff8
commit ebafc0a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...lr/FieldMapper/ParentChildFieldMapper.php → ...entTranslation/ParentChildFieldMapper.php b/...lr/FieldMapper/ParentChildFieldMapper.php → ...entTranslation/ParentChildFieldMapper.php
@@ -2,22 +2,23 @@
 
 declare(strict_types=1);
 
-namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper;
+namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation;
 
 use Ibexa\Contracts\Core\Persistence\Content as SPIContent;
 use Ibexa\Contracts\Core\Persistence\Content\ContentInfo;
 use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler;
-use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler;
 use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler;
+use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler;
+use Ibexa\Contracts\Core\Persistence\Filter\Content\Handler;
 use Ibexa\Contracts\Core\Repository\Exceptions\BadStateException;
 use Ibexa\Contracts\Core\Repository\Exceptions\InvalidCriterionArgumentException;
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeIdentifier;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ParentLocationId;
 use Ibexa\Contracts\Core\Repository\Values\Filter\Filter;
-use Ibexa\Contracts\Core\Persistence\Filter\Content\Handler;
 use Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper;
+use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\FullTextFieldResolver;
 
 use function array_key_exists;
 use function array_keys;

diff --git a/...olr/FieldMapper/FullTextFieldResolver.php → ...hildFieldMapper/FullTextFieldResolver.php b/...olr/FieldMapper/FullTextFieldResolver.php → ...hildFieldMapper/FullTextFieldResolver.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper;
+namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper;
 
 use Ibexa\Contracts\Core\Persistence\Content as SPIContent;
 

diff --git a/...dResolver/NativeFulltextFieldResolver.php → ...dResolver/NativeFulltextFieldResolver.php b/...dResolver/NativeFulltextFieldResolver.php → ...dResolver/NativeFulltextFieldResolver.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\FullTextFieldResolver;
+namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\FullTextFieldResolver;
 
 use Ibexa\Contracts\Core\Persistence\Content as SPIContent;
 use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler;
@@ -11,7 +11,7 @@
 use Ibexa\Contracts\Core\Search\FieldType\FullTextField;
 use Ibexa\Contracts\Core\Search\FieldType\TextField;
 use Ibexa\Core\Search\Common\FieldRegistry;
-use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\FullTextFieldResolver;
+use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\FullTextFieldResolver;
 
 final class NativeFulltextFieldResolver implements FullTextFieldResolver
 {

diff --git a/lib/Resources/config/search/common/parent_child_indexing/common.yaml b/lib/Resources/config/search/common/parent_child_indexing/common.yaml
@@ -1,6 +1,6 @@
 services:
     netgen_search_extra.parent_child_indexing.parent_child_field_mapper:
-        class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ParentChildFieldMapper
+        class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper
         arguments:
             - '@netgen_search_extra.parent_child_indexing.fulltext_field_resolver'
             - '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler'
@@ -20,7 +20,7 @@ services:
             - '%netgen.ibexa_search_extra.parent_child_indexer%'
 
     netgen_search_extra.parent_child_indexing.fulltext_field_resolver.native:
-        class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\FullTextFieldResolver\NativeFulltextFieldResolver
+        class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\FullTextFieldResolver\NativeFulltextFieldResolver
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler'
             - '@Ibexa\Core\Search\Common\FieldRegistry'