Merge pull request #261 from magento-ogre/PR_Branch_ES

[Phoenix Media - Ogres]   Accept Phoenix Media Sprint 4 code for Elastic Search

Author: Kopylova,Olga(okopylova)

app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogSearch\Model\Indexer;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Indexer\IndexStructureInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class IndexStructureFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    protected $structures = null;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Configuration path by which current indexer handler stored
+     *
+     * @var string
+     */
+    private $configPath;
+
+    /**
+     * Factory constructor
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param ScopeConfigInterface $scopeConfig
+     * @param string $configPath
+     * @param string[] $structures
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ScopeConfigInterface $scopeConfig,
+        $configPath,
+        array $structures = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->scopeConfig = $scopeConfig;
+        $this->configPath = $configPath;
+        $this->structures = $structures;
+    }
+
+    /**
+     * Create index structure
+     *
+     * @param array $data
+     * @return IndexStructureInterface
+     */
+    public function create(array $data = [])
+    {
+        $currentStructure = $this->scopeConfig->getValue($this->configPath, ScopeInterface::SCOPE_STORE);
+        if (!isset($this->structures[$currentStructure])) {
+            throw new \LogicException(
+                'There is no such index structure: ' . $currentStructure
+            );
+        }
+        $indexStructure = $this->objectManager->create($this->structures[$currentStructure], $data);
+
+        if (!$indexStructure instanceof IndexStructureInterface) {
+            throw new \InvalidArgumentException(
+                $indexStructure . ' doesn\'t implement \Magento\Framework\Indexer\IndexStructureInterface'
+            );
+        }
+
+        return $indexStructure;
+    }
+}

app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogSearch\Model\Indexer;
+
+use Magento\Framework\Indexer\IndexStructureInterface;
+
+class IndexStructureProxy implements IndexStructureInterface
+{
+    /**
+     * @var IndexStructureInterface
+     */
+    private $indexStructureEntity;
+
+    /**
+     * @var IndexStructureFactory
+     */
+    private $indexStructureFactory;
+
+    /**
+     * @param IndexStructureFactory $indexStructureFactory
+     */
+    public function __construct(
+        IndexStructureFactory $indexStructureFactory
+    ) {
+        $this->indexStructureFactory = $indexStructureFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete(
+        $index,
+        array $dimensions = []
+    ) {
+        return $this->getEntity()->delete($index, $dimensions);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(
+        $index,
+        array $fields,
+        array $dimensions = []
+    ) {
+        return $this->getEntity()->create($index, $fields, $dimensions);
+    }
+
+    /**
+     * Get instance of current index structure
+     *
+     * @return IndexStructureInterface
+     */
+    private function getEntity()
+    {
+        if (empty($this->indexStructureEntity)) {
+            $this->indexStructureEntity = $this->indexStructureFactory->create();
+        }
+        return $this->indexStructureEntity;
+    }
+}

app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
+use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Search\Request\Dimension;
 use Magento\Framework\Search\Request\IndexScopeResolverInterface;
 use Magento\Framework\Indexer\SaveHandler\Batch;
@@ -17,7 +18,7 @@
 class IndexerHandler implements IndexerInterface
 {
     /**
-     * @var IndexStructure
+     * @var IndexStructureInterface
      */
     private $indexStructure;
 
@@ -57,7 +58,7 @@ class IndexerHandler implements IndexerInterface
     private $indexScopeResolver;
 
     /**
-     * @param IndexStructure $indexStructure
+     * @param IndexStructureInterface $indexStructure
      * @param ResourceConnection $resource
      * @param Config $eavConfig
      * @param Batch $batch
@@ -66,7 +67,7 @@ class IndexerHandler implements IndexerInterface
      * @param int $batchSize
      */
     public function __construct(
-        IndexStructure $indexStructure,
+        IndexStructureInterface $indexStructure,
         ResourceConnection $resource,
         Config $eavConfig,
         Batch $batch,

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

@@ -19,6 +19,15 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\CatalogSearch\Model\Indexer\IndexStructureFactory">
+        <arguments>
+            <argument name="configPath" xsi:type="const">Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH</argument>
+            <argument name="structures" xsi:type="array">
+                <item name="mysql" xsi:type="string">Magento\CatalogSearch\Model\Indexer\IndexStructure</item>
+            </argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Framework\Indexer\IndexStructureInterface" type="Magento\CatalogSearch\Model\Indexer\IndexStructureProxy" />
     <type name="Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderContainer">
         <arguments>
             <argument name="dataProviders" xsi:type="array">

dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml

@@ -49,5 +49,8 @@
             <path>dev/tests/api-functional/testsuite/Magento/Webapi/Routing/RequestIdOverrideTest.php</path>
             <word>overriden</word>
         </item>
+        <item>
+            <path>composer.lock</path>
+        </item>
     </whitelist>
 </config>