Merge pull request #11 from ensi-platform/task-105513-v7

#103513 Отдельные версии для Elasticsearch 7 и 8

Author: MsNatali

README.md

@@ -278,6 +278,14 @@ class ProductsController
 }
 ```
 
+## Elasticsearch 7 and 8 support.
+
+Due to the incompatibility of clients for Elasticsearch 7 and 8, separate releases will be created for these versions.
+Development for each version is carried out in the corresponding branch.
+
+To make changes to version 7, you need to create a task branch based on v7 and make a pull request to it.
+For version 8 it is similar, but based on the v8 branch.
+
 ## Contributing
 
 Please see [CONTRIBUTING](.github/CONTRIBUTING.md) for details.

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "php": "^8.0",
         "elasticsearch/elasticsearch": "^7.13",
-        "ensi/laravel-elastic-query": "^0.3.0",
+        "ensi/laravel-elastic-query": "^7.0",
         "illuminate/contracts": "^8.37 || ^9.0",
         "illuminate/support": "^8.0 || ^9.0",
         "spatie/laravel-package-tools": "^1.4.3",

composer.lock

@@ -2,7 +2,7 @@
 
 namespace Ensi\LaravelElasticQuerySpecification\Tests\Data;
 
-use Elasticsearch\Client;
+use Ensi\LaravelElasticQuery\ElasticClient;
 
 abstract class IndexSeeder
 {
@@ -14,14 +14,14 @@ abstract class IndexSeeder
 
     protected bool $recreate;
 
-    protected ?Client $client;
+    protected ?ElasticClient $client;
 
     public function __construct()
     {
         $this->recreate = config('tests.recreate_index', true);
     }
 
-    public function setClient(Client $client): void
+    public function setClient(ElasticClient $client): void
     {
         $this->client = $client;
     }
@@ -50,31 +50,27 @@ public function call(): void
 
     protected function isIndexExists(): bool
     {
-        return $this->client->indices()->exists(['index' => $this->indexName]);
+        return $this->client->indicesExists($this->indexName);
     }
 
     protected function dropIndex(): void
     {
-        $this->client
-            ->indices()
-            ->delete(['index' => $this->indexName]);
+        $this->client->indicesDelete($this->indexName);
     }
 
     protected function createIndex(): void
     {
-        $params = ['index' => $this->indexName];
+        $settings = [];
 
         if (!empty($this->mappings)) {
-            data_set($params, 'body.mappings', $this->mappings);
+            $settings['mappings'] = $this->mappings;
         }
 
         if (!empty($this->settings)) {
-            data_set($params, 'body.settings', $this->settings);
+            $settings['settings'] = $this->settings;
         }
 
-        $this->client
-            ->indices()
-            ->create($params);
+        $this->client->indicesCreate($this->indexName, $settings);
     }
 
     protected function loadFixtures(): void
@@ -88,7 +84,7 @@ protected function loadFixtures(): void
             );
 
         if ($hasChanges) {
-            $this->client->indices()->refresh(['index' => $this->indexName]);
+            $this->client->indicesRefresh($this->indexName);
         }
     }
 
@@ -104,7 +100,7 @@ protected function loadFixture(string $path): bool
             ->flatMap(fn (array $document, int $index) => $this->documentToCommand($document, $index))
             ->toArray();
 
-        $this->client->bulk(['body' => $body]);
+        $this->client->bulk($this->indexName, $body);
 
         return true;
     }

tests/Data/IndexSeeder.php

@@ -2,16 +2,15 @@
 
 namespace Ensi\LaravelElasticQuerySpecification\Tests\Data;
 
-use Elasticsearch\Client;
-use Elasticsearch\ClientBuilder;
+use Ensi\LaravelElasticQuery\ElasticClient;
 
 class SeedRunner
 {
     private static ?self $instance;
 
     private array $processed = [];
 
-    protected function __construct(private Client $client)
+    protected function __construct(private ElasticClient $client)
     {
     }
 
@@ -38,9 +37,7 @@ public static function getInstance(): self
 
     private static function createInstance(): self
     {
-        $client = ClientBuilder::create()
-            ->setHosts(config('laravel-elastic-query.connection.hosts'))
-            ->build();
+        $client = ElasticClient::fromConfig(config('laravel-elastic-query.connection'));
 
         return new self($client);
     }