TASK: Merge branch '3.0' int master

daniellienert · daniellienert · commit c4baf28d7f3a · 2018-04-19T16:58:28.000+02:00
diff --git a/Classes/Driver/AbstractNodeTypeMappingBuilder.php b/Classes/Driver/AbstractNodeTypeMappingBuilder.php
@@ -69,7 +69,7 @@ public function initializeObject($cause)
      * @param string $nodeTypeName
      * @return string
      */
-    public static function convertNodeTypeNameToMappingName($nodeTypeName)
+    public function convertNodeTypeNameToMappingName($nodeTypeName)
     {
         return str_replace('.', '-', $nodeTypeName);
     }
diff --git a/Classes/Driver/NodeTypeMappingBuilderInterface.php b/Classes/Driver/NodeTypeMappingBuilderInterface.php
@@ -27,7 +27,7 @@ interface NodeTypeMappingBuilderInterface
      * @param string $nodeTypeName
      * @return string
      */
-    public static function convertNodeTypeNameToMappingName($nodeTypeName);
+    public function convertNodeTypeNameToMappingName($nodeTypeName);
 
     /**
      * Builds a Mapping Collection from the configured node types
diff --git a/Classes/Driver/Version1/DocumentDriver.php b/Classes/Driver/Version1/DocumentDriver.php
@@ -38,11 +38,10 @@ class DocumentDriver extends AbstractDriver implements DocumentDriverInterface
      */
     public function delete(NodeInterface $node, $identifier)
     {
-        $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;
         return [
             [
                 'delete' => [
-                    '_type' => $nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($node->getNodeType()),
+                    '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($node->getNodeType()),
                     '_id' => $identifier
                 ]
             ]
@@ -54,8 +53,6 @@ public function delete(NodeInterface $node, $identifier)
      */
     public function deleteDuplicateDocumentNotMatchingType(Index $index, $documentIdentifier, NodeType $nodeType)
     {
-        $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;
-
         $index->request('DELETE', '/_query', [], json_encode([
             'query' => [
                 'bool' => [
@@ -66,7 +63,7 @@ public function deleteDuplicateDocumentNotMatchingType(Index $index, $documentId
                     ],
                     'must_not' => [
                         'term' => [
-                            '_type' => $nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($nodeType->getName())
+                            '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($nodeType->getName())
                         ]
                     ],
                 ]
diff --git a/Classes/Driver/Version1/IndexerDriver.php b/Classes/Driver/Version1/IndexerDriver.php
@@ -102,11 +102,10 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
 
         $this->logger->log(sprintf('NodeIndexer (%s): Updated fulltext index for %s (%s)', $closestFulltextNodeDocumentIdentifier, $closestFulltextNodeContextPath, $closestFulltextNode->getIdentifier()), LOG_DEBUG, null, 'ElasticSearch (CR)');
 
-        $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;
         return [
             [
                 'update' => [
-                    '_type' => $nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),
+                    '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),
                     '_id' => $closestFulltextNodeDocumentIdentifier
                 ]
             ],
diff --git a/Classes/Driver/Version1/Mapping/NodeTypeMappingBuilder.php b/Classes/Driver/Version1/Mapping/NodeTypeMappingBuilder.php
@@ -93,7 +93,7 @@ public function buildMappingInformation(Index $index)
                 continue;
             }
 
-            $type = $index->findType(self::convertNodeTypeNameToMappingName($nodeTypeName));
+            $type = $index->findType($this->convertNodeTypeNameToMappingName($nodeTypeName));
             $mapping = new Mapping($type);
             $fullConfiguration = $nodeType->getFullConfiguration();
             if (isset($fullConfiguration['search']['elasticSearchMapping'])) {
diff --git a/Classes/Driver/Version2/DocumentDriver.php b/Classes/Driver/Version2/DocumentDriver.php
@@ -35,8 +35,6 @@ class DocumentDriver extends Version1\DocumentDriver
      */
     public function deleteDuplicateDocumentNotMatchingType(Index $index, $documentIdentifier, NodeType $nodeType)
     {
-        $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;
-
         $result = $index->request('GET', '/_search?scroll=1m', [], json_encode([
             'sort' => ['_doc'],
             'query' => [
@@ -48,7 +46,7 @@ public function deleteDuplicateDocumentNotMatchingType(Index $index, $documentId
                     ],
                     'must_not' => [
                         'term' => [
-                            '_type' => $nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($nodeType->getName())
+                            '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($nodeType->getName())
                         ]
                     ]
                 ]
diff --git a/Classes/Driver/Version2/IndexerDriver.php b/Classes/Driver/Version2/IndexerDriver.php
@@ -110,11 +110,10 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
             $upsertFulltextParts[$node->getIdentifier()] = $fulltextIndexOfNode;
         }
 
-        $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;
         return [
             [
                 'update' => [
-                    '_type' => $nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),
+                    '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),
                     '_id' => $closestFulltextNodeDocumentIdentifier
                 ]
             ],
diff --git a/Classes/Driver/Version5/IndexerDriver.php b/Classes/Driver/Version5/IndexerDriver.php
@@ -113,7 +113,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
         return [
             [
                 'update' => [
-                    '_type' => AbstractNodeTypeMappingBuilder::convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),
+                    '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),
                     '_id' => $closestFulltextNodeDocumentIdentifier
                 ]
             ],
diff --git a/Classes/Driver/Version5/Mapping/NodeTypeMappingBuilder.php b/Classes/Driver/Version5/Mapping/NodeTypeMappingBuilder.php
@@ -60,7 +60,7 @@ public function buildMappingInformation(Index $index)
                 continue;
             }
 
-            $type = $index->findType(self::convertNodeTypeNameToMappingName($nodeTypeName));
+            $type = $index->findType($this->convertNodeTypeNameToMappingName($nodeTypeName));
             $mapping = new Mapping($type);
             $fullConfiguration = $nodeType->getFullConfiguration();
             if (isset($fullConfiguration['search']['elasticSearchMapping'])) {
diff --git a/Classes/Indexer/NodeIndexer.php b/Classes/Indexer/NodeIndexer.php
@@ -201,8 +201,7 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
             $documentIdentifier = $this->calculateDocumentIdentifier($node, $targetWorkspaceName);
             $nodeType = $node->getNodeType();
 
-            $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;
-            $mappingType = $this->getIndex()->findType($nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($nodeType));
+            $mappingType = $this->getIndex()->findType($this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($nodeType));
 
             if ($this->bulkProcessing === false) {
                 // Remove document with the same contextPathHash but different NodeType, required after NodeType change

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function initializeObject($cause)`
`69`	`69`	`* @param string $nodeTypeName`
`70`	`70`	`* @return string`
`71`	`71`	`*/`
`72`		`- public static function convertNodeTypeNameToMappingName($nodeTypeName)`
	`72`	`+ public function convertNodeTypeNameToMappingName($nodeTypeName)`
`73`	`73`	`{`
`74`	`74`	`return str_replace('.', '-', $nodeTypeName);`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,10 @@ class DocumentDriver extends AbstractDriver implements DocumentDriverInterface`
`38`	`38`	`*/`
`39`	`39`	`public function delete(NodeInterface $node, $identifier)`
`40`	`40`	`{`
`41`		`- $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;`
`42`	`41`	`return [`
`43`	`42`	`[`
`44`	`43`	`'delete' => [`
`45`		`- '_type' => $nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($node->getNodeType()),`
	`44`	`+ '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($node->getNodeType()),`
`46`	`45`	`'_id' => $identifier`
`47`	`46`	`]`
`48`	`47`	`]`
`@@ -54,8 +53,6 @@ public function delete(NodeInterface $node, $identifier)`
`54`	`53`	`*/`
`55`	`54`	`public function deleteDuplicateDocumentNotMatchingType(Index $index, $documentIdentifier, NodeType $nodeType)`
`56`	`55`	`{`
`57`		`- $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;`
`58`		`-`
`59`	`56`	`$index->request('DELETE', '/_query', [], json_encode([`
`60`	`57`	`'query' => [`
`61`	`58`	`'bool' => [`
`@@ -66,7 +63,7 @@ public function deleteDuplicateDocumentNotMatchingType(Index $index, $documentId`
`66`	`63`	`],`
`67`	`64`	`'must_not' => [`
`68`	`65`	`'term' => [`
`69`		`- '_type' => $nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($nodeType->getName())`
	`66`	`+ '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($nodeType->getName())`
`70`	`67`	`]`
`71`	`68`	`],`
`72`	`69`	`]`
Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,10 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe`
`102`	`102`
`103`	`103`	`$this->logger->log(sprintf('NodeIndexer (%s): Updated fulltext index for %s (%s)', $closestFulltextNodeDocumentIdentifier, $closestFulltextNodeContextPath, $closestFulltextNode->getIdentifier()), LOG_DEBUG, null, 'ElasticSearch (CR)');`
`104`	`104`
`105`		`- $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;`
`106`	`105`	`return [`
`107`	`106`	`[`
`108`	`107`	`'update' => [`
`109`		`- '_type' => $nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),`
	`108`	`+ '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),`
`110`	`109`	`'_id' => $closestFulltextNodeDocumentIdentifier`
`111`	`110`	`]`
`112`	`111`	`],`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function buildMappingInformation(Index $index)`
`93`	`93`	`continue;`
`94`	`94`	`}`
`95`	`95`
`96`		`- $type = $index->findType(self::convertNodeTypeNameToMappingName($nodeTypeName));`
	`96`	`+ $type = $index->findType($this->convertNodeTypeNameToMappingName($nodeTypeName));`
`97`	`97`	`$mapping = new Mapping($type);`
`98`	`98`	`$fullConfiguration = $nodeType->getFullConfiguration();`
`99`	`99`	`if (isset($fullConfiguration['search']['elasticSearchMapping'])) {`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ class DocumentDriver extends Version1\DocumentDriver`
`35`	`35`	`*/`
`36`	`36`	`public function deleteDuplicateDocumentNotMatchingType(Index $index, $documentIdentifier, NodeType $nodeType)`
`37`	`37`	`{`
`38`		`- $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;`
`39`		`-`
`40`	`38`	`$result = $index->request('GET', '/_search?scroll=1m', [], json_encode([`
`41`	`39`	`'sort' => ['_doc'],`
`42`	`40`	`'query' => [`
`@@ -48,7 +46,7 @@ public function deleteDuplicateDocumentNotMatchingType(Index $index, $documentId`
`48`	`46`	`],`
`49`	`47`	`'must_not' => [`
`50`	`48`	`'term' => [`
`51`		`- '_type' => $nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($nodeType->getName())`
	`49`	`+ '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($nodeType->getName())`
`52`	`50`	`]`
`53`	`51`	`]`
`54`	`52`	`]`
Original file line number	Diff line number	Diff line change
`@@ -110,11 +110,10 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe`
`110`	`110`	`$upsertFulltextParts[$node->getIdentifier()] = $fulltextIndexOfNode;`
`111`	`111`	`}`
`112`	`112`
`113`		`- $nodeTypeMappingBuilder = $this->nodeTypeMappingBuilder;`
`114`	`113`	`return [`
`115`	`114`	`[`
`116`	`115`	`'update' => [`
`117`		`- '_type' => $nodeTypeMappingBuilder::convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),`
	`116`	`+ '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),`
`118`	`117`	`'_id' => $closestFulltextNodeDocumentIdentifier`
`119`	`118`	`]`
`120`	`119`	`],`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe`
`113`	`113`	`return [`
`114`	`114`	`[`
`115`	`115`	`'update' => [`
`116`		`- '_type' => AbstractNodeTypeMappingBuilder::convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),`
	`116`	`+ '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),`
`117`	`117`	`'_id' => $closestFulltextNodeDocumentIdentifier`
`118`	`118`	`]`
`119`	`119`	`],`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function buildMappingInformation(Index $index)`
`60`	`60`	`continue;`
`61`	`61`	`}`
`62`	`62`
`63`		`- $type = $index->findType(self::convertNodeTypeNameToMappingName($nodeTypeName));`
	`63`	`+ $type = $index->findType($this->convertNodeTypeNameToMappingName($nodeTypeName));`
`64`	`64`	`$mapping = new Mapping($type);`
`65`	`65`	`$fullConfiguration = $nodeType->getFullConfiguration();`
`66`	`66`	`if (isset($fullConfiguration['search']['elasticSearchMapping'])) {`