Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source

Author: vrann

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

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch\Elasticsearch5\Model\Client;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -49,7 +50,7 @@ public function __construct(
         if (empty($options['hostname']) || ((!empty($options['enableAuth']) &&
             ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) {
             throw new LocalizedException(
-                __('We were unable to perform the search because of a search engine misconfiguration.')
+                __('The search failed because of a search engine misconfiguration.')
             );
         }
 

app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php

@@ -3,12 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch\Model\Adapter;
 
 use Magento\Framework\App\ObjectManager;
 
 /**
  * Elasticsearch adapter
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Elasticsearch
 {
@@ -110,7 +112,7 @@ public function __construct(
         } catch (\Exception $e) {
             $this->logger->critical($e);
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('We were unable to perform the search because of a search engine misconfiguration.')
+                __('The search failed because of a search engine misconfiguration.')
             );
         }
     }

app/code/Magento/Elasticsearch/Model/Adapter/Index/IndexNameResolver.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch\Model\Adapter\Index;
 
 use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
@@ -67,7 +68,7 @@ public function __construct(
         } catch (\Exception $e) {
             $this->logger->critical($e);
             throw new LocalizedException(
-                __('We were unable to perform the search because of a search engine misconfiguration.')
+                __('The search failed because of a search engine misconfiguration.')
             );
         }
     }

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

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch\Model\Client;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -44,7 +45,7 @@ public function __construct(
         if (empty($options['hostname']) || ((!empty($options['enableAuth']) &&
             ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) {
             throw new LocalizedException(
-                __('We were unable to perform the search because of a search engine misconfiguration.')
+                __('The search failed because of a search engine misconfiguration.')
             );
         }
 

app/code/Magento/Elasticsearch/etc/di.xml

@@ -114,6 +114,14 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Search\Model\EngineResolver">
+        <arguments>
+            <argument name="engines" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">elasticsearch</item>
+                <item name="elasticsearch5" xsi:type="string">elasticsearch5</item>
+            </argument>
+        </arguments>
+    </type>
     <virtualType name="Magento\Elasticsearch\SearchAdapter\ProductEntityMetadata" type="Magento\Framework\Search\EntityMetadata">
         <arguments>
             <argument name="entityId" xsi:type="string">_id</argument>

app/code/Magento/Elasticsearch/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Elasticsearch" setup_version="2.0.0">
+    <module name="Magento_Elasticsearch">
         <sequence>
             <module name="Magento_CatalogSearch"/>
             <module name="Magento_Search"/>

dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php

@@ -95,7 +95,7 @@ private function search($text)
     }
 
     /**
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch5
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductName()
@@ -104,7 +104,7 @@ public function testSearchConfigurableProductBySimpleProductName()
     }
 
     /**
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeMultiselect()
@@ -113,7 +113,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeMultiselect
     }
 
     /**
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeSelect()
@@ -122,7 +122,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeSelect()
     }
 
     /**
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeShortDescription()