MERGE: Merge branch 'master' into fix-error-handling

Author: kdambekalns

Classes/Driver/AbstractIndexerDriver.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver;
 
 /*
@@ -49,7 +48,7 @@ protected function findClosestFulltextRoot(NodeInterface $node)
             if ($closestFulltextNode === null) {
                 // root of hierarchy, no fulltext root found anymore, abort silently...
                 if ($node->getPath() !== '/' && $node->getPath() !== '/sites') {
-                    $this->logger->log(sprintf('NodeIndexer: No fulltext root found for node %s (%s)', $node->getPath(), $node->getIdentifier()), LOG_WARNING, null, 'ElasticSearch (CR)');
+                    $this->logger->log(sprintf('NodeIndexer: No fulltext root found for node %s (%s)', $node->getContextPath(), $node->getIdentifier()), LOG_WARNING, null, 'ElasticSearch (CR)');
                 }
 
                 return null;

Classes/Driver/Version1/IndexerDriver.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version1;
 
 /*

Classes/Driver/Version2/IndexerDriver.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version2;
 
 /*
@@ -93,7 +92,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
 
         if ($closestFulltextNode->isRemoved()) {
             // fulltext root is removed, abort silently...
-            $this->logger->log(sprintf('NodeIndexer (%s): Fulltext root found for %s (%s) not updated, it is removed', $closestFulltextNodeDocumentIdentifier, $node->getPath(), $node->getIdentifier()), LOG_DEBUG, null, 'ElasticSearch (CR)');
+            $this->logger->log(sprintf('NodeIndexer (%s): Fulltext root found for %s (%s) not updated, it is removed', $closestFulltextNodeDocumentIdentifier, $node->getContextPath(), $node->getIdentifier()), LOG_DEBUG, null, 'ElasticSearch (CR)');
 
             return null;
         }

Classes/Indexer/NodeIndexer.php

@@ -125,6 +125,7 @@ class NodeIndexer extends AbstractNodeIndexer implements BulkNodeIndexerInterfac
      * Returns the index name to be used for indexing, with optional indexNamePostfix appended.
      *
      * @return string
+     * @throws Exception
      */
     public function getIndexName()
     {
@@ -151,6 +152,7 @@ public function setIndexNamePostfix($indexNamePostfix)
      * Return the currently active index to be used for indexing
      *
      * @return Index
+     * @throws Exception
      */
     public function getIndex()
     {
@@ -166,7 +168,6 @@ public function getIndex()
      * @param NodeInterface $node
      * @param string $targetWorkspaceName In case indexing is triggered during publishing, a target workspace name will be passed in
      * @return void
-     * @throws \Neos\ContentRepository\Search\Exception\IndexingException
      */
     public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
     {
@@ -240,7 +241,7 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
                     $this->removeNode($node, $context->getWorkspaceName());
                     $this->logger->log(sprintf('NodeIndexer (%s): Removed node with identifier %s, no longer in workspace %s', $documentIdentifier, $node->getIdentifier(), $context->getWorkspaceName()), LOG_DEBUG, null, 'ElasticSearch (CR)');
                 } else {
-                    $this->logger->log(sprintf('NodeIndexer (%s): Could not index node with identifier %s, not found in workspace %s', $documentIdentifier, $node->getIdentifier(), $context->getWorkspaceName()), LOG_DEBUG, null, 'ElasticSearch (CR)');
+                    $this->logger->log(sprintf('NodeIndexer (%s): Could not index node with identifier %s, not found in workspace %s with dimensions %s', $documentIdentifier, $node->getIdentifier(), $context->getWorkspaceName(), json_encode($context->getDimensions())), LOG_DEBUG, null, 'ElasticSearch (CR)');
                 }
             }
         };
@@ -310,6 +311,7 @@ public function removeNode(NodeInterface $node, $targetWorkspaceName = null)
      * Perform the current bulk request
      *
      * @return void
+     * @throws Exception
      */
     public function flush()
     {
@@ -354,7 +356,6 @@ public function flush()
      * @return void
      * @throws Exception
      * @throws ApiException
-     * @throws \Exception
      */
     public function updateIndexAlias()
     {
@@ -406,6 +407,7 @@ public function updateIndexAlias()
      * making the "old" index a stale one).
      *
      * @return array<string> a list of index names which were removed
+     * @throws Exception
      */
     public function removeOldIndices()
     {