ACP2E-3892: [Mainline] Unpopulated pages are cached due to search engine errors

Author: aplapana

app/code/Magento/Catalog/Block/Product/ListProduct.php

@@ -89,7 +89,6 @@ class ListProduct extends AbstractProduct implements IdentityInterface
      * @param array $data
      * @param OutputHelper|null $outputHelper
      * @param SpecialPriceBulkResolverInterface|null $specialPriceBulkResolver
-     * @param ResponseHttp|null $response
      */
     public function __construct(
         Context $context,

app/code/Magento/CatalogSearch/i18n/en_US.csv

@@ -42,3 +42,4 @@ name,name
 "This value must be compatible with the corresponding setting in the configured search engine.","This value must be compatible with the corresponding setting in the configured search engine."
 "If not specified, Default Search Engine will be used.","If not specified, Default Search Engine will be used."
 "This search engine option is no longer supported by Adobe. It is recommended to use OpenSearch as a search engine instead.","This search engine option is no longer supported by Adobe. It is recommended to use OpenSearch as a search engine instead."
+"Could not perform search","Could not perform search"

app/code/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/Adapter.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Elasticsearch\ElasticAdapter\SearchAdapter;
 
@@ -49,23 +49,6 @@ class Adapter implements AdapterInterface
      */
     private $queryContainerFactory;
 
-    /**
-     * Empty response from Elasticsearch.
-     *
-     * @var array
-     */
-    private static $emptyRawResponse = [
-        'hits' => [
-            'hits' => []
-        ],
-        'aggregations' => [
-            'price_bucket' => [],
-            'category_bucket' => [
-                'buckets' => []
-            ]
-        ]
-    ];
-
     /**
      * @var LoggerInterface
      */

lib/internal/Magento/Framework/Search/AdapterInterface.php

@@ -16,18 +16,6 @@
  */
 interface AdapterInterface
 {
-    public const EMPTY_RAW_RESPONSE = [
-        'hits' => [
-            'hits' => []
-        ],
-        'aggregations' => [
-            'price_bucket' => [],
-            'category_bucket' => [
-                'buckets' => []
-            ]
-        ]
-    ];
-
     /**
      * Process Search Request
      *

lib/internal/Magento/Framework/Search/Search.php

@@ -6,7 +6,6 @@
 namespace Magento\Framework\Search;
 
 use Magento\AdvancedSearch\Model\Client\ClientException;
-use Magento\Elasticsearch\SearchAdapter\ResponseFactory;
 use Magento\Framework\Api\Search\SearchInterface;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
 use Magento\Framework\App\ScopeResolverInterface;
@@ -38,35 +37,26 @@ class Search implements SearchInterface
      */
     private SearchResponseBuilder $searchResponseBuilder;
 
-    /**
-     * @var ResponseFactory
-     */
-    private ResponseFactory $responseFactory;
-
     /**
      * @param Builder $requestBuilder
      * @param ScopeResolverInterface $scopeResolver
      * @param SearchEngineInterface $searchEngine
      * @param SearchResponseBuilder $searchResponseBuilder
-     * @param ResponseFactory $responseFactory
      */
     public function __construct(
         Builder $requestBuilder,
         ScopeResolverInterface $scopeResolver,
         SearchEngineInterface $searchEngine,
         SearchResponseBuilder $searchResponseBuilder,
-        ResponseFactory $responseFactory
     ) {
         $this->requestBuilder = $requestBuilder;
         $this->scopeResolver = $scopeResolver;
         $this->searchEngine = $searchEngine;
         $this->searchResponseBuilder = $searchResponseBuilder;
-        $this->responseFactory = $responseFactory;
     }
 
     /**
      * @inheritdoc
-     * @throws LocalizedException
      */
     public function search(SearchCriteriaInterface $searchCriteria)
     {