AC-6714: Fixed static and integration test failures

Author: faizan-shk

app/code/Magento/Elasticsearch8/Model/Client/Elasticsearch.php

@@ -120,67 +120,6 @@ public function testConnection(): bool
         return $this->ping();
     }
 
-    /**
-     * Build config for Elasticsearch 8
-     *
-     * @param array $options
-     * @return array
-     */
-    private function buildESConfig(array $options = []): array
-    {
-        $hostname = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
-        // @codingStandardsIgnoreStart
-        $protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
-        // @codingStandardsIgnoreEnd
-        if (!$protocol) {
-            $protocol = 'http';
-        }
-
-        $authString = '';
-        if (!empty($options['enableAuth']) && (int)$options['enableAuth'] === 1) {
-            $authString = "{$options['username']}:{$options['password']}@";
-        }
-
-        $portString = '';
-        if (!empty($options['port'])) {
-            $portString = ':' . $options['port'];
-        }
-
-        $host = $protocol . '://' . $authString . $hostname . $portString;
-
-        $options['hosts'] = [$host];
-
-        return $options;
-    }
-
-    /**
-     * Performs bulk query over Elasticsearch 8 index
-     *
-     * @param array $query
-     * @return void
-     */
-    public function bulkQuery(array $query)
-    {
-        $this->getElasticsearchClient()->bulk($query);
-    }
-
-    /**
-     * Creates an Elasticsearch 8 index.
-     *
-     * @param string $index
-     * @param array $settings
-     * @return void
-     */
-    public function createIndex(string $index, array $settings)
-    {
-        $this->getElasticsearchClient()->indices()->create(
-            [
-                'index' => $index,
-                'body' => $settings,
-            ]
-        );
-    }
-
     /**
      * Add/update an Elasticsearch index settings.
      *
@@ -198,33 +137,6 @@ public function putIndexSettings(string $index, array $settings): void
         );
     }
 
-    /**
-     * Delete an Elasticsearch 8 index.
-     *
-     * @param string $index
-     * @return void
-     */
-    public function deleteIndex(string $index)
-    {
-        $this->getElasticsearchClient()->indices()->delete(['index' => $index]);
-    }
-
-    /**
-     * Check if index is empty.
-     *
-     * @param string $index
-     * @return bool
-     */
-    public function isEmptyIndex(string $index): bool
-    {
-        $stats = $this->getElasticsearchClient()->indices()->stats(['index' => $index, 'metric' => 'docs']);
-        if ($stats['indices'][$index]['primaries']['docs']['count'] === 0) {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Updates alias.
      *
@@ -258,6 +170,39 @@ public function indexExists(string $index): bool
         return $this->getElasticsearchClient()->indices()->exists(['index' => $index])->asBool();
     }
 
+    /**
+     * Build config for Elasticsearch 8
+     *
+     * @param array $options
+     * @return array
+     */
+    private function buildESConfig(array $options = []): array
+    {
+        $hostname = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
+        // @codingStandardsIgnoreStart
+        $protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
+        // @codingStandardsIgnoreEnd
+        if (!$protocol) {
+            $protocol = 'http';
+        }
+
+        $authString = '';
+        if (!empty($options['enableAuth']) && (int)$options['enableAuth'] === 1) {
+            $authString = "{$options['username']}:{$options['password']}@";
+        }
+
+        $portString = '';
+        if (!empty($options['port'])) {
+            $portString = ':' . $options['port'];
+        }
+
+        $host = $protocol . '://' . $authString . $hostname . $portString;
+
+        $options['hosts'] = [$host];
+
+        return $options;
+    }
+
     /**
      * Exists alias.
      *
@@ -274,6 +219,34 @@ public function existsAlias(string $alias, string $index = '')
         return $this->getElasticsearchClient()->indices()->existsAlias($params)->asBool();
     }
 
+    /**
+     * Performs bulk query over Elasticsearch 8 index
+     *
+     * @param array $query
+     * @return void
+     */
+    public function bulkQuery(array $query)
+    {
+        $this->getElasticsearchClient()->bulk($query);
+    }
+
+    /**
+     * Creates an Elasticsearch 8 index.
+     *
+     * @param string $index
+     * @param array $settings
+     * @return void
+     */
+    public function createIndex(string $index, array $settings)
+    {
+        $this->getElasticsearchClient()->indices()->create(
+            [
+                'index' => $index,
+                'body' => $settings,
+            ]
+        );
+    }
+
     /**
      * Get alias.
      *
@@ -311,6 +284,33 @@ public function addFieldsMapping(array $fields, string $index, string $entityTyp
         $this->getElasticsearchClient()->indices()->putMapping($params);
     }
 
+    /**
+     * Delete an Elasticsearch 8 index.
+     *
+     * @param string $index
+     * @return void
+     */
+    public function deleteIndex(string $index)
+    {
+        $this->getElasticsearchClient()->indices()->delete(['index' => $index]);
+    }
+
+    /**
+     * Check if index is empty.
+     *
+     * @param string $index
+     * @return bool
+     */
+    public function isEmptyIndex(string $index): bool
+    {
+        $stats = $this->getElasticsearchClient()->indices()->stats(['index' => $index, 'metric' => 'docs']);
+        if ($stats['indices'][$index]['primaries']['docs']['count'] === 0) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Execute search by $query
      *

dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/QuickSearchTest.php

@@ -48,6 +48,7 @@ public function testQuickSearchWithImprovedPriceRangeCalculation()
      * @magentoAppArea frontend
      * @magentoDbIsolation disabled
      * @magentoConfigFixture current_store catalog/search/elasticsearch7_minimum_should_match 100%
+     * @magentoConfigFixture current_store catalog/search/elasticsearch8_minimum_should_match 100%
      * @magentoConfigFixture current_store catalog/search/opensearch_minimum_should_match 100%
      * @magentoDataFixture Magento/Elasticsearch/_files/products_for_search.php
      * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php