TASK: Change _type usages to _neosType property

Author: daniellienert

Classes/Driver/Version5/DocumentDriver.php

@@ -18,6 +18,7 @@
 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;
 use Neos\ContentRepository\Domain\Model\NodeType;
 use Neos\Flow\Annotations as Flow;
@@ -54,6 +55,7 @@ public function delete(NodeInterface $node, string $identifier): array
     /**
      * {@inheritdoc}
      * @throws \Flowpack\ElasticSearch\Exception
+     * @throws \Neos\Flow\Http\Exception
      */
     public function deleteDuplicateDocumentNotMatchingType(Index $index, string $documentIdentifier, NodeType $nodeType): void
     {
@@ -68,18 +70,17 @@ public function deleteDuplicateDocumentNotMatchingType(Index $index, string $doc
                     ],
                     'must_not' => [
                         'term' => [
-                            '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($nodeType->getName())
+                            Mapping::NEOS_TYPE_FIELD => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($nodeType->getName())
                         ]
                     ]
                 ]
             ]
         ]));
         $treatedContent = $result->getTreatedContent();
         $scrollId = $treatedContent['_scroll_id'];
-        $mapHitToDeleteRequest = function ($hit) {
+        $mapHitToDeleteRequest = static function ($hit) {
             return json_encode([
                 'delete' => [
-                    '_type' => $hit['_type'],
                     '_id' => $hit['_id']
                 ]
             ]);

Classes/Driver/Version5/IndexerDriver.php

@@ -41,7 +41,7 @@ public function document(string $indexName, NodeInterface $node, ElasticSearchDo
             return [
                 [
                     'update' => [
-                        '_type' => $document->getType()->getName(),
+                        '_type' => '_doc',
                         '_id' => $document->getId(),
                         '_index' => $indexName,
                         '_retry_on_conflict' => 3
@@ -70,8 +70,9 @@ public function document(string $indexName, NodeInterface $node, ElasticSearchDo
         return [
             [
                 'index' => [
-                    '_type' => $document->getType()->getName(),
-                    '_id' => $document->getId()
+                    '_type' => '_doc',
+                    '_id' => $document->getId(),
+                    '_index' => $indexName,
                 ]
             ],
             $documentData
@@ -112,7 +113,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, string
         return [
             [
                 'update' => [
-                    '_type' => $this->nodeTypeMappingBuilder->convertNodeTypeNameToMappingName($closestFulltextNode->getNodeType()->getName()),
+                    '_type' => '_doc',
                     '_id' => $closestFulltextNodeDocumentIdentifier
                 ]
             ],

Classes/Driver/Version5/RequestDriver.php

@@ -38,7 +38,6 @@ public function bulk(Index $index, $request): array
 
         // Bulk request MUST end with line return
         $request = trim($request) . "\n";
-
         $response = $index->request('POST', '/_bulk', [], $request)->getOriginalResponse()->getBody()->getContents();
 
         return array_map('json_decode', explode("\n", $response));

Classes/Eel/ElasticSearchQueryBuilder.php

@@ -18,6 +18,7 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException;
+use Flowpack\ElasticSearch\Domain\Model\Mapping;
 use Neos\Flow\Log\ThrowableStorageInterface;
 use Neos\Flow\Log\Utility\LogEnvironment;
 use Neos\Flow\Persistence\Exception\IllegalObjectTypeException;
@@ -725,7 +726,7 @@ public function moreLikeThis(array $like, array $fields = [], array $options = [
             $respondedDocument = current($respondedDocuments);
             return [
                 '_id' => $respondedDocument['_id'],
-                '_type' => $respondedDocument['_type'],
+                Mapping::NEOS_TYPE_FIELD => $respondedDocument[Mapping::NEOS_TYPE_FIELD],
                 '_index' => $respondedDocument['_index'],
             ];
         };