Revert "AC-7821:Extract ES8 module to a separate repository - Fixed Unit/Static/Integration test failures"

This reverts commit ae43c29.

Author: glo71317

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php

@@ -111,7 +111,7 @@ class ElasticsearchTest extends TestCase
      */
     protected function setUp(): void
     {
-        if (!class_exists(\Elasticsearch\ClientBuilder::class)) { /** @phpstan-ignore-line */
+        if (!class_exists(\Elasticsearch\Client::class)) {
             $this->markTestSkipped('AC-6597: Skipped as Elasticsearch 8 is configured');
         }
 

app/code/Magento/Elasticsearch7/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php

@@ -226,7 +226,7 @@ public function testGetItemsWithEnabledSearchSuggestion(): void
      */
     public function testGetItemsException(): void
     {
-        if (!class_exists(\Elasticsearch\ClientBuilder::class)) { /** @phpstan-ignore-line */
+        if (!class_exists(\Elasticsearch\Client::class)) {
             $this->markTestSkipped('AC-6597: Skipped as Elasticsearch 8 is configured');
         }
 

dev/tests/integration/testsuite/Magento/Elasticsearch7/SearchAdapter/ConnectionManagerTest.php

@@ -43,7 +43,7 @@ protected function setUp(): void
      */
     public function testCorrectElasticsearchClientEs7()
     {
-        if (!class_exists(\Elasticsearch\ClientBuilder::class)) { /** @phpstan-ignore-line */
+        if (!class_exists(\Elasticsearch\Client::class)) {
             $this->markTestSkipped('AC-6597: Skipped as Elasticsearch 8 is configured');
         }