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

Author: aplapana

app/code/Magento/AdvancedSearch/Model/Client/ClientException.php

@@ -7,9 +7,7 @@
 
 namespace Magento\AdvancedSearch\Model\Client;
 
-use Magento\Framework\Exception\LocalizedException;
-
-class ClientException extends LocalizedException
+class ClientException extends \Exception
 {
 
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/DataProvider/Filters.php

@@ -81,7 +81,7 @@ public function getData(string $layerType, ?array $attributesToFilter = null) :
      * @return bool
      * @throws LocalizedException
      */
-    private function isNeedToAddFilter(AbstractFilter $filter, ?array $attributesToFilter): bool
+    private function isNeedToAddFilter(AbstractFilter $filter, ?array $attributesToFilter = null): bool
     {
         if ($attributesToFilter === null) {
             $result = (bool)$filter->getItemsCount();

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php

@@ -17,7 +17,6 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ArgumentsProcessorInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\Search\Request\EmptyRequestDataException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Search\Api\SearchInterface;
 
@@ -155,9 +154,7 @@ public function getResult(
                     'suggestions' => $suggestions,
                 ]
             );
-        } catch (GraphQlInputException $e) {
-            throw $e;
-        } catch (\InvalidArgumentException|EmptyRequestDataException|ClientException) {
+        } catch (\InvalidArgumentException|ClientException) {
             return $this->searchResultFactory->create(
                 [
                     'totalCount' => 0,

app/code/Magento/OpenSearch/SearchAdapter/Adapter.php

@@ -133,12 +133,10 @@ public function query(RequestInterface $request) : QueryResponse
             $rawResponse = $client->query($query);
         } catch (Missing404Exception|BadRequest400Exception $e) {
             $this->logger->critical($e);
-            throw new EmptyRequestDataException(
-                (new Phrase("Could not perform search query."))->render()
-            );
+            throw new EmptyRequestDataException("Could not perform search query.");
         } catch (\Exception $e) {
             $this->logger->critical($e);
-            throw new ClientException(__("Could not perform search query."), $e->getCode(), $e);
+            throw new ClientException("Could not perform search query.", $e->getCode(), $e);
         } finally {
             if (isset($pitId)) {
                 $client->closePointInTime(['body' => ['pit_id' => [$pitId]]]);

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

@@ -7,4 +7,3 @@
 "OpenSearch HTTP Username","OpenSearch HTTP Username"
 "OpenSearch HTTP Password","OpenSearch HTTP Password"
 "OpenSearch Server Timeout","OpenSearch Server Timeout"
-"Could not perform search query.","Could not perform search query."