Skip to content

Commit bc9c616

Browse files
irenelagnoirenelagno
committed
MC-31986: Add support for ES 7 to 2.4-develop
1 parent 39914f7 commit bc9c616

File tree

99 files changed

+1717
-2717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1717
-2717
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,28 @@
101101
<entity name="ProductAttributeOptionTwoForExportImport" extends="productAttributeOption2" type="ProductAttributeOption">
102102
<data key="label">option2</data>
103103
</entity>
104+
<entity name="ProductAttributeOption10" type="ProductAttributeOption">
105+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
106+
<data key="label" unique="suffix">3.5</data>
107+
<data key="value" unique="suffix">3.5</data>
108+
<data key="is_default">false</data>
109+
<data key="sort_order">1</data>
110+
<requiredEntity type="StoreLabel">Option12Store1</requiredEntity>
111+
</entity>
112+
<entity name="ProductAttributeOption11" type="ProductAttributeOption">
113+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
114+
<data key="label" unique="suffix">10.12</data>
115+
<data key="value" unique="suffix">10.12</data>
116+
<data key="is_default">false</data>
117+
<data key="sort_order">2</data>
118+
<requiredEntity type="StoreLabel">Option13Store1</requiredEntity>
119+
</entity>
120+
<entity name="ProductAttributeOption12" type="ProductAttributeOption">
121+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
122+
<data key="label" unique="suffix">36</data>
123+
<data key="value" unique="suffix">36</data>
124+
<data key="is_default">false</data>
125+
<data key="sort_order">3</data>
126+
<requiredEntity type="StoreLabel">Option14Store1</requiredEntity>
127+
</entity>
104128
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,16 @@
8080
<data key="store_id">1</data>
8181
<data key="label">Blue</data>
8282
</entity>
83+
<entity name="Option12Store1" type="StoreLabel">
84+
<data key="store_id">1</data>
85+
<data key="label">3.5</data>
86+
</entity>
87+
<entity name="Option13Store1" type="StoreLabel">
88+
<data key="store_id">1</data>
89+
<data key="label">10.12</data>
90+
</entity>
91+
<entity name="Option14Store1" type="StoreLabel">
92+
<data key="store_id">1</data>
93+
<data key="label">36</data>
94+
</entity>
8395
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMultiselectAttributeSection.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminProductMultiselectAttributeSection">
12+
<element name="option" type="text" selector="//option[contains(@data-title,'{{value}}')]" parameterized="true"/>
13+
</section>
14+
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontProductsDisplayUsingElasticSearchTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
</createData>
128128

129129
<!--Enable ElasticSearch as search engine.-->
130-
<magentoCLI command="config:set catalog/search/engine elasticsearch6" stepKey="enableElasticSearchAsSearchEngine"/>
130+
<magentoCLI command="config:set {{SearchEngineElasticsearchConfigData.path}} {{SearchEngineElasticsearchConfigData.value}}" stepKey="enableElasticSearchAsSearchEngine"/>
131131
<magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchEnable"/>
132132
<magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchEnable"/>
133133

‎app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
/**
99
* Elasticsearch 5x test connection block
1010
* @codeCoverageIgnore
11+
* @deprecated because of EOL for Elasticsearch5
1112
*/
1213
class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection
1314
{
1415
/**
15-
* {@inheritdoc}
16+
* @inheritdoc
1617
*/
1718
protected function _getFieldMapping()
1819
{

‎app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/TestConnection.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Magento\Elasticsearch\Model\ResourceModel\Index;
1010
use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
1111
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
12-
use Magento\Framework\App\ObjectManager;
1312
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
1413

1514
/**
@@ -34,19 +33,17 @@ class CategoryFieldsProvider implements AdditionalFieldsProviderInterface
3433

3534
/**
3635
* @param Index $resourceIndex
37-
* @param AttributeProvider|null $attributeAdapterProvider
38-
* @param ResolverInterface|null $fieldNameResolver
36+
* @param AttributeProvider $attributeAdapterProvider
37+
* @param ResolverInterface $fieldNameResolver
3938
*/
4039
public function __construct(
4140
Index $resourceIndex,
42-
AttributeProvider $attributeAdapterProvider = null,
43-
ResolverInterface $fieldNameResolver = null
41+
AttributeProvider $attributeAdapterProvider,
42+
ResolverInterface $fieldNameResolver
4443
) {
4544
$this->resourceIndex = $resourceIndex;
46-
$this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
47-
->get(AttributeProvider::class);
48-
$this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
49-
->get(ResolverInterface::class);
45+
$this->attributeAdapterProvider = $attributeAdapterProvider;
46+
$this->fieldNameResolver = $fieldNameResolver;
5047
}
5148

5249
/**

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Magento\Elasticsearch\Model\Adapter\DataMapperInterface;
1717
use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType;
1818
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
19-
use Magento\Framework\App\ObjectManager;
2019
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
2120

2221
/**
@@ -103,8 +102,8 @@ class ProductDataMapper implements DataMapperInterface
103102
* @param FieldMapperInterface $fieldMapper
104103
* @param StoreManagerInterface $storeManager
105104
* @param DateFieldType $dateFieldType
106-
* @param AttributeProvider|null $attributeAdapterProvider
107-
* @param ResolverInterface|null $fieldNameResolver
105+
* @param AttributeProvider $attributeAdapterProvider
106+
* @param ResolverInterface $fieldNameResolver
108107
*/
109108
public function __construct(
110109
Builder $builder,
@@ -113,19 +112,17 @@ public function __construct(
113112
FieldMapperInterface $fieldMapper,
114113
StoreManagerInterface $storeManager,
115114
DateFieldType $dateFieldType,
116-
AttributeProvider $attributeAdapterProvider = null,
117-
ResolverInterface $fieldNameResolver = null
115+
AttributeProvider $attributeAdapterProvider,
116+
ResolverInterface $fieldNameResolver
118117
) {
119118
$this->builder = $builder;
120119
$this->attributeContainer = $attributeContainer;
121120
$this->resourceIndex = $resourceIndex;
122121
$this->fieldMapper = $fieldMapper;
123122
$this->storeManager = $storeManager;
124123
$this->dateFieldType = $dateFieldType;
125-
$this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
126-
->get(AttributeProvider::class);
127-
$this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
128-
->get(ResolverInterface::class);
124+
$this->attributeAdapterProvider = $attributeAdapterProvider;
125+
$this->fieldNameResolver = $fieldNameResolver;
129126

130127
$this->mediaGalleryRoles = [
131128
self::MEDIA_ROLE_IMAGE,

‎app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php

Lines changed: 10 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -6,52 +6,16 @@
66

77
namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper;
88

9-
use Magento\Eav\Model\Config;
109
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
1110
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
1211
use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
1312
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
14-
use Magento\Framework\App\ObjectManager;
15-
use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldType;
16-
use Magento\Framework\Registry;
17-
use Magento\Store\Model\StoreManagerInterface as StoreManager;
18-
use \Magento\Customer\Model\Session as CustomerSession;
1913

2014
/**
21-
* Class ProductFieldMapper
15+
* Class ProductFieldMapper provides field name by attribute code and retrieve all attribute types
2216
*/
2317
class ProductFieldMapper implements FieldMapperInterface
2418
{
25-
/**
26-
* @deprecated
27-
* @var Config
28-
*/
29-
protected $eavConfig;
30-
31-
/**
32-
* @deprecated
33-
* @var FieldType
34-
*/
35-
protected $fieldType;
36-
37-
/**
38-
* @deprecated
39-
* @var CustomerSession
40-
*/
41-
protected $customerSession;
42-
43-
/**
44-
* @deprecated
45-
* @var StoreManager
46-
*/
47-
protected $storeManager;
48-
49-
/**
50-
* @deprecated
51-
* @var Registry
52-
*/
53-
protected $coreRegistry;
54-
5519
/**
5620
* @var AttributeProvider
5721
*/
@@ -68,36 +32,18 @@ class ProductFieldMapper implements FieldMapperInterface
6832
private $fieldProvider;
6933

7034
/**
71-
* @param Config $eavConfig
72-
* @param FieldType $fieldType
73-
* @param CustomerSession $customerSession
74-
* @param StoreManager $storeManager
75-
* @param Registry $coreRegistry
76-
* @param ResolverInterface|null $fieldNameResolver
77-
* @param AttributeProvider|null $attributeAdapterProvider
78-
* @param FieldProviderInterface|null $fieldProvider
35+
* @param ResolverInterface $fieldNameResolver
36+
* @param AttributeProvider $attributeAdapterProvider
37+
* @param FieldProviderInterface $fieldProvider
7938
*/
8039
public function __construct(
81-
Config $eavConfig,
82-
FieldType $fieldType,
83-
CustomerSession $customerSession,
84-
StoreManager $storeManager,
85-
Registry $coreRegistry,
86-
ResolverInterface $fieldNameResolver = null,
87-
AttributeProvider $attributeAdapterProvider = null,
88-
FieldProviderInterface $fieldProvider = null
40+
ResolverInterface $fieldNameResolver,
41+
AttributeProvider $attributeAdapterProvider,
42+
FieldProviderInterface $fieldProvider
8943
) {
90-
$this->eavConfig = $eavConfig;
91-
$this->fieldType = $fieldType;
92-
$this->customerSession = $customerSession;
93-
$this->storeManager = $storeManager;
94-
$this->coreRegistry = $coreRegistry;
95-
$this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
96-
->get(ResolverInterface::class);
97-
$this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
98-
->get(AttributeProvider::class);
99-
$this->fieldProvider = $fieldProvider ?: ObjectManager::getInstance()
100-
->get(FieldProviderInterface::class);
44+
$this->fieldNameResolver = $fieldNameResolver;
45+
$this->attributeAdapterProvider = $attributeAdapterProvider;
46+
$this->fieldProvider = $fieldProvider;
10147
}
10248

10349
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
/**
1212
* Elasticsearch client
13+
*
14+
* @deprecated the Elasticsearch 5 doesn't supported due to EOL
1315
*/
1416
class Elasticsearch implements ClientInterface
1517
{

0 commit comments

Comments
 (0)