Merge remote-tracking branch 'origin/MC-25254' into 2.4-develop-pr5

Author: zakdma

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

@@ -285,7 +285,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match_mapping_type' => 'string',
                                 'mapping' => [
                                     'type' => 'integer',
-                                    'index' => false,
+                                    'index' => true,
                                 ],
                             ],
                         ],
@@ -296,7 +296,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'mapping' => $this->prepareFieldInfo(
                                     [
                                         'type' => 'text',
-                                        'index' => false,
+                                        'index' => true,
                                     ]
                                 ),
                             ],

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

@@ -278,7 +278,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match_mapping' => 'string',
                                 'mapping' => [
                                     'type' => 'integer',
-                                    'index' => 'no'
+                                    'index' => 'not_analyzed',
                                 ],
                             ],
                         ],
@@ -288,7 +288,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match_mapping' => 'string',
                                 'mapping' => [
                                     'type' => 'string',
-                                    'index' => 'no'
+                                    'index' => 'not_analyzed',
                                 ],
                             ],
                         ]

app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php

@@ -11,7 +11,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
- * Class ElasticsearchTest
+ * Test elasticsearch client methods.
  */
 class ElasticsearchTest extends \PHPUnit\Framework\TestCase
 {
@@ -379,7 +379,7 @@ public function testAddFieldsMapping()
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
                                             'type' => 'integer',
-                                            'index' => false
+                                            'index' => true
                                         ],
                                     ],
                                 ],
@@ -389,7 +389,7 @@ public function testAddFieldsMapping()
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
                                             'type' => 'text',
-                                            'index' => false,
+                                            'index' => true,
                                         ],
                                     ],
                                 ],
@@ -449,7 +449,7 @@ public function testAddFieldsMappingFailure()
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
                                             'type' => 'integer',
-                                            'index' => false
+                                            'index' => true,
                                         ],
                                     ],
                                 ],
@@ -459,7 +459,7 @@ public function testAddFieldsMappingFailure()
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
                                             'type' => 'text',
-                                            'index' => false,
+                                            'index' => true,
                                         ],
                                     ],
                                 ]

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

@@ -292,7 +292,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match_mapping_type' => 'string',
                                 'mapping' => [
                                     'type' => 'integer',
-                                    'index' => false,
+                                    'index' => true,
                                 ],
                             ],
                         ],
@@ -302,7 +302,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match_mapping_type' => 'string',
                                 'mapping' => [
                                     'type' => 'text',
-                                    'index' => false,
+                                    'index' => true,
                                     'copy_to' => '_search'
                                 ],
                             ],

app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php

@@ -445,7 +445,7 @@ public function testAddFieldsMapping()
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
                                             'type' => 'integer',
-                                            'index' => false
+                                            'index' => true,
                                         ],
                                     ],
                                 ],
@@ -455,7 +455,7 @@ public function testAddFieldsMapping()
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
                                             'type' => 'text',
-                                            'index' => false,
+                                            'index' => true,
                                             'copy_to' => '_search'
                                         ],
                                     ],
@@ -515,7 +515,7 @@ public function testAddFieldsMappingFailure()
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
                                             'type' => 'integer',
-                                            'index' => false
+                                            'index' => true,
                                         ],
                                     ],
                                 ],
@@ -525,7 +525,7 @@ public function testAddFieldsMappingFailure()
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
                                             'type' => 'text',
-                                            'index' => false,
+                                            'index' => true,
                                             'copy_to' => '_search'
                                         ],
                                     ],