TASK: Modify to work with Elasticsearch 7

Author: Peter Rauber

Classes/Domain/Factory/DocumentFactory.php

@@ -19,6 +19,7 @@
 use Neos\Error\Messages\Error;
 use Neos\Error\Messages\Result as ErrorResult;
 use Neos\Flow\Annotations as Flow;
+use Neos\Utility\Arrays;
 
 /**
  * Reconstitute a Document from the ElasticSearch index.
@@ -45,7 +46,7 @@ public function createFromResponse(Model\AbstractType $type, $id = null, Respons
             $error = new Error('The received index name "%s" does not match the expected one "%s".', 1340264838, [$content['_index'], $type->getIndex()->getName()]);
             $verificationResults->addError($error);
         }
-        if (isset($content['_type']) && $type->getName() !== $content['_type']) {
+        if ($type->getName() !== Arrays::getValueByPath($content, '_source.neos_type')) {
             $error = new Error('The received type name "%s" does not match the expected one "%s".', 1340265103, [$content['_type'], $type->getName()]);
             $verificationResults->addError($error);
         }

Classes/Domain/Model/AbstractType.php

@@ -17,6 +17,7 @@
 use Flowpack\ElasticSearch\Domain\Factory\DocumentFactory;
 use Flowpack\ElasticSearch\Transfer\Response;
 use Neos\Flow\Annotations as Flow;
+use Neos\Utility\TypeHandling;
 
 /**
  * An abstract document type. Implement your own or use the GenericType provided with this package.
@@ -81,9 +82,9 @@ public function getIndex(): Index
      * @throws \Flowpack\ElasticSearch\Exception
      * @throws \Neos\Flow\Http\Exception
      */
-    public function findDocumentById(string $id): Document
+    public function findDocumentById(string $id): ?Document
     {
-        $response = $this->request('GET', '/' . $id);
+        $response = $this->request('GET', '/_doc/' . $id);
         if ($response->getStatusCode() !== 200) {
             return null;
         }

Classes/Domain/Model/Document.php

@@ -92,10 +92,10 @@ public function store(): void
     {
         if ($this->id !== null) {
             $method = 'PUT';
-            $path = '/' . $this->id;
+            $path = '/_doc/' . $this->id;
         } else {
             $method = 'POST';
-            $path = '';
+            $path = '/_doc/';
         }
 
         $response = $this->request($method, $path, [], json_encode($this->getData()));

Classes/Indexer/Object/ObjectIndexer.php

@@ -17,6 +17,7 @@
 use Flowpack\ElasticSearch\Domain\Model\Client;
 use Flowpack\ElasticSearch\Domain\Model\Document;
 use Flowpack\ElasticSearch\Domain\Model\GenericType;
+use Flowpack\ElasticSearch\Domain\Model\Mapping;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Persistence\PersistenceManagerInterface;
 use Neos\Flow\Reflection\ReflectionService;
@@ -121,7 +122,6 @@ protected function getIndexTypeForObject($object, Client $client = null)
     protected function getIndexablePropertiesAndValuesFromObject($object)
     {
         $className = TypeHandling::getTypeForValue($object);
-        $data = [];
         foreach ($this->indexInformer->getClassProperties($className) as $propertyName) {
             if (ObjectAccess::isPropertyGettable($object, $propertyName) === false) {
                 continue;
@@ -172,6 +172,7 @@ public function objectIndexActionRequired($object, Client $client = null)
         $document = $type->findDocumentById($id);
         if ($document !== null) {
             $objectData = $this->getIndexablePropertiesAndValuesFromObject($object);
+            $objectData[Mapping::NEOS_TYPE_FIELD] = $type->getName();
             if (strcmp(json_encode($objectData), json_encode($document->getData())) === 0) {
                 $actionType = null;
             } else {