Merge branch '1.x' into add-common-search-adapter

Author: lukmzig

src/SearchIndexAdapter/OpenSearch/DataObject/IndexIconUpdateService.php

@@ -22,7 +22,6 @@
 
 /**
  * @internal
-
  */
 final readonly class IndexIconUpdateService implements IndexIconUpdateServiceInterface
 {

src/SearchIndexAdapter/OpenSearch/IndexMappingService.php

@@ -25,6 +25,9 @@
 use Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\SearchIndexConfigServiceInterface;
 use Pimcore\Model\DataObject\ClassDefinition\Data;
 
+/**
+ * @internal
+ */
 readonly class IndexMappingService implements IndexMappingServiceInterface
 {
     public function __construct(

src/SearchIndexAdapter/OpenSearch/IndexStatsService.php

@@ -26,6 +26,9 @@
 use Pimcore\Bundle\GenericDataIndexBundle\Traits\LoggerAwareTrait;
 use Pimcore\SearchClient\SearchClientInterface;
 
+/**
+ * @internal
+ */
 final class IndexStatsService implements IndexStatsServiceInterface
 {
     use LoggerAwareTrait;

src/SearchIndexAdapter/OpenSearch/QueryLanguage/FieldNameValidator/FieldExistsValidator.php

@@ -21,6 +21,9 @@
 use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\QueryLanguage\FieldNameValidatorInterface;
 use Symfony\Component\DependencyInjection\Attribute\AsTaggedItem;
 
+/**
+ * @internal
+ */
 #[AsTaggedItem(priority: 0)]
 final readonly class FieldExistsValidator implements FieldNameValidatorInterface
 {

src/SearchIndexAdapter/OpenSearch/QueryLanguage/FieldNameValidator/LocalizedFieldValidator.php

@@ -22,6 +22,9 @@
 use Pimcore\Tool;
 use Symfony\Component\DependencyInjection\Attribute\AsTaggedItem;
 
+/**
+ * @internal
+ */
 #[AsTaggedItem(priority: 1)]
 final readonly class LocalizedFieldValidator implements FieldNameValidatorInterface
 {

src/SearchIndexAdapter/OpenSearch/QueryLanguage/FieldNameValidator/RelationValidator.php

@@ -21,6 +21,9 @@
 use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\QueryLanguage\FieldNameValidatorInterface;
 use Symfony\Component\DependencyInjection\Attribute\AsTaggedItem;
 
+/**
+ * @internal
+ */
 #[AsTaggedItem(priority: 2)]
 final readonly class RelationValidator implements FieldNameValidatorInterface
 {

src/SearchIndexAdapter/OpenSearch/Search/FetchIdsBySearchService.php

@@ -24,6 +24,9 @@
 use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\SearchIndexServiceInterface;
 use Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\SearchIndexConfigServiceInterface;
 
+/**
+ * @internal
+ */
 final readonly class FetchIdsBySearchService implements FetchIdsBySearchServiceInterface
 {
     public function __construct(

src/Service/Search/SearchService/IndexNameResolver.php

@@ -26,6 +26,7 @@
 use Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\IndexService\ElementTypeAdapter\AssetTypeAdapter;
 use Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\IndexService\ElementTypeAdapter\DataObjectTypeAdapter;
 use Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\IndexService\ElementTypeAdapter\DocumentTypeAdapter;
+use Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\SearchIndexConfigServiceInterface;
 
 /**
  * @internal
@@ -36,6 +37,7 @@ public function __construct(
         private AssetTypeAdapter $assetTypeAdapter,
         private DataObjectTypeAdapter $dataObjectTypeAdapter,
         private DocumentTypeAdapter $documentTypeAdapter,
+        private SearchIndexConfigServiceInterface $searchIndexConfigService
     ) {
     }
 
@@ -56,7 +58,7 @@ public function resolveIndexName(SearchInterface $search): string
         }
 
         if ($search instanceof ElementSearch) {
-            return IndexName::ELEMENT_SEARCH->value;
+            return $this->searchIndexConfigService->getIndexName(IndexName::ELEMENT_SEARCH->value);
         }
 
         throw new InvalidArgumentException('Unsupported search type: ' . get_class($search));