FEATURE: Make index configuration possible by dimensioncombination or index

Author: daniellienert

Classes/ElasticSearchClient.php

@@ -13,6 +13,7 @@
  * source code.
  */
 
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\ConfigurationException;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\DimensionsService;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\IndexNameStrategyInterface;
 use Flowpack\ElasticSearch\Domain\Model\Client;
@@ -108,6 +109,7 @@ public function withDimensions(\Closure $closure, array $dimensionValues = []):
      *
      * @return string
      * @throws Exception
+     * @throws ConfigurationException
      * @todo Add a contraints, if the system use content dimensions, the dimensionsHash MUST be set
      */
     public function getIndexName(): string
@@ -122,12 +124,13 @@ public function getIndexName(): string
     /**
      * @return string
      * @throws Exception
+     * @throws ConfigurationException
      */
     public function getIndexNamePrefix(): string
     {
         $name = trim($this->indexNameStrategy->get());
         if ($name === '') {
-            throw new Exception('Index name can not be null');
+            throw new ConfigurationException('IndexNameStrategy ' . get_class($this->indexNameStrategy) . ' returned an empty index name', 1582538800);
         }
 
         return $name;
@@ -140,6 +143,7 @@ public function getIndexNamePrefix(): string
      * @return \Flowpack\ElasticSearch\Domain\Model\Index
      * @throws Exception
      * @throws \Flowpack\ElasticSearch\Exception
+     * @throws ConfigurationException
      */
     public function getIndex(): Index
     {

Classes/Indexer/NodeIndexer.php

@@ -130,6 +130,12 @@ class NodeIndexer extends AbstractNodeIndexer implements BulkNodeIndexerInterfac
      */
     protected $batchSize;
 
+    /**
+     * @var array
+     * @Flow\InjectConfiguration(package="Flowpack.ElasticSearch", path="indexes")
+     */
+    protected $indexConfiguration;
+
     /**
      * The current Elasticsearch bulk request, in the format required by http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html
      *
@@ -163,6 +169,7 @@ public function setDimensions(array $dimensionsValues): void
      * Returns the index name to be used for indexing, with optional indexNamePostfix appended.
      *
      * @return string
+     * @throws Exception\ConfigurationException
      * @throws Exception
      */
     public function getIndexName(): string
@@ -192,11 +199,18 @@ public function setIndexNamePostfix(string $indexNamePostfix): void
      * @return Index
      * @throws Exception
      * @throws \Flowpack\ElasticSearch\Exception
+     * @throws Exception\ConfigurationException
      */
     public function getIndex(): Index
     {
         $index = $this->searchClient->findIndex($this->getIndexName());
-        $index->setSettingsKey($this->searchClient->getIndexName());
+
+        $perDimensionConfiguration = $this->indexConfiguration[$this->searchClient->getBundle()][$this->searchClient->getIndexName()] ?? null;
+        if ($perDimensionConfiguration !== null) {
+            $index->setSettingsKey($this->searchClient->getIndexName());
+        } else {
+            $index->setSettingsKey($this->searchClient->getIndexNamePrefix());
+        }
 
         return $index;
     }
@@ -212,7 +226,7 @@ public function getIndex(): Index
     public function indexNode(NodeInterface $node, $targetWorkspaceName = null): void
     {
         if ($this->nodeTypeIndexingConfiguration->isIndexable($node->getNodeType()) === false) {
-            $this->logger->debug(sprintf('NodeIndexer - Node "%s" (%s) skipped, Node Type is not allowed in the index.', $node->getContextPath(), $node->getNodeType()));
+            $this->logger->debug(sprintf('NodeIndexer - Node "%s" (%s) skipped, Node Type is not allowed in the index.', $node->getContextPath(), $node->getNodeType()), LogEnvironment::fromMethodName(__METHOD__));
             return;
         }