Merge pull request #329 from Flowpack/task/refactor-nodetype-name

!!! TASK: Do not convert the nodeType name

Author: daniellienert

Classes/Driver/AbstractNodeTypeMappingBuilder.php

@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver;
@@ -66,17 +65,6 @@ public function initializeObject($cause): void
         }
     }
 
-    /**
-     * Converts a Content Repository Node Type name into a name which can be used for an Elasticsearch Mapping
-     *
-     * @param string $nodeTypeName
-     * @return string
-     */
-    public function convertNodeTypeNameToMappingName(string $nodeTypeName): string
-    {
-        return str_replace('.', '-', $nodeTypeName);
-    }
-
     /**
      * @return Result
      */

Classes/Driver/NodeTypeMappingBuilderInterface.php

@@ -23,15 +23,6 @@
  */
 interface NodeTypeMappingBuilderInterface
 {
-
-    /**
-     * Converts a Content Repository Node Type name into a name which can be used for an Elasticsearch Mapping
-     *
-     * @param string $nodeTypeName
-     * @return string
-     */
-    public function convertNodeTypeNameToMappingName(string $nodeTypeName): string;
-
     /**
      * Builds a Mapping Collection from the configured node types
      *

Classes/Driver/Version6/DocumentDriver.php

@@ -15,7 +15,6 @@
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractDriver;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\DocumentDriverInterface;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\NodeTypeMappingBuilderInterface;
 use Flowpack\ElasticSearch\Domain\Model\Index;
 use Flowpack\ElasticSearch\Domain\Model\Mapping;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
@@ -30,12 +29,6 @@
  */
 class DocumentDriver extends AbstractDriver implements DocumentDriverInterface
 {
-    /**
-     * @Flow\Inject
-     * @var NodeTypeMappingBuilderInterface
-     */
-    protected $nodeTypeMappingBuilder;
-
     /**
      * {@inheritdoc}
      */
@@ -44,7 +37,7 @@ public function delete(NodeInterface $node, string $identifier): array
         return [
             [
                 'delete' => [
-                    '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($node->getNodeType()->getName()),
+                    '_type' => $node->getNodeType()->getName(),
                     '_id' => $identifier
                 ]
             ]
@@ -69,7 +62,7 @@ public function deleteDuplicateDocumentNotMatchingType(Index $index, string $doc
                     ],
                     'must_not' => [
                         'term' => [
-                            Mapping::NEOS_TYPE_FIELD => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($nodeType->getName())
+                            Mapping::NEOS_TYPE_FIELD => $nodeType->getName()
                         ]
                     ]
                 ]

Classes/Driver/Version6/Mapping/NodeTypeMappingBuilder.php

@@ -58,8 +58,7 @@ public function buildMappingInformation(Index $index): MappingCollection
                 continue;
             }
 
-            $type = $index->findType($this->convertNodeTypeNameToMappingName($nodeTypeName));
-            $mapping = new Mapping($type);
+            $mapping = new Mapping($index->findType($nodeTypeName));
             $fullConfiguration = $nodeType->getFullConfiguration();
             if (isset($fullConfiguration['search']['elasticSearchMapping'])) {
                 $fullMapping = $fullConfiguration['search']['elasticSearchMapping'];

Classes/Indexer/NodeIndexer.php

@@ -259,7 +259,7 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null): voi
             $documentIdentifier = $this->calculateDocumentIdentifier($node, $targetWorkspaceName);
             $nodeType = $node->getNodeType();
 
-            $mappingType = $this->getIndex()->findType($this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($nodeType->getName()));
+            $mappingType = $this->getIndex()->findType($nodeType->getName());
 
             if ($this->bulkProcessing === false) {
                 // Remove document with the same contextPathHash but different NodeType, required after NodeType change