ACPT-1688: Fix Static Tests failures on Application-Server branch;

-Remove dependency of library classes on non-library classes

Author: aa-kashk

app/code/Magento/CatalogGraphQl/Plugin/Search/RequestBuilderPlugin.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogGraphQl\Plugin\Search;
+
+use Magento\CatalogGraphQl\DataProvider\Product\RequestDataBuilder;
+use Magento\Framework\Search\Request\Config;
+
+class RequestBuilderPlugin
+{
+    public function __construct(private RequestDataBuilder $localData)
+    {
+    }
+
+    /**
+     * @param Config $subject
+     * @param callable $proceed
+     * @param string $requestName
+     * @return array
+     */
+    public function aroundGet(Config $subject, callable $proceed, string $requestName) {
+
+        if ($this->localData->getData($requestName)) {
+            return $this->localData->getData($requestName);
+        } else {
+            return $proceed($requestName);
+        }
+    }
+}

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

@@ -101,7 +101,9 @@
             </argument>
         </arguments>
     </type>
-
+    <type name="Magento\Framework\Search\Request\Config">
+        <plugin name="localRequestDataPlugin"  type="Magento\CatalogGraphQl\Plugin\Search\RequestBuilderPlugin" />
+    </type>
     <type name="Magento\Framework\Search\Request\Config\FilesystemReader">
         <plugin name="productAttributesDynamicFields"  type="Magento\CatalogGraphQl\Plugin\Search\Request\ConfigReader" />
     </type>

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

@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Search\Request;
 
-use Magento\CatalogGraphQl\DataProvider\Product\RequestDataBuilder;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\ObjectManagerInterface;
@@ -50,32 +49,24 @@ class Builder implements ResetAfterRequestInterface
      */
     private $cleaner;
 
-    /**
-     * @var RequestDataBuilder|mixed
-     */
-    private RequestDataBuilder $localData;
-
     /**
      * Request Builder constructor
      *
      * @param ObjectManagerInterface $objectManager
      * @param Config $config
      * @param Binder $binder
      * @param Cleaner $cleaner
-     * @param RequestDataBuilder|null $localData
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
         Config $config,
         Binder $binder,
-        Cleaner $cleaner,
-        RequestDataBuilder $localData = null
+        Cleaner $cleaner
     ) {
         $this->objectManager = $objectManager;
         $this->config = $config;
         $this->binder = $binder;
         $this->cleaner = $cleaner;
-        $this->localData = $localData ?? $this->objectManager->get(RequestDataBuilder::class);
     }
 
     /**
@@ -164,12 +155,9 @@ public function create()
             throw new \InvalidArgumentException("Request name not defined.");
         }
         $requestName = $this->data['requestName'];
-        if ($this->localData->getData($requestName)) {
-            $data = $this->localData->getData($requestName);
-        } else {
-            /** @var array $data */
-            $data = $this->config->get($requestName);
-        }
+        /** @var array $data */
+        $data = $this->config->get($requestName);
+
         if ($data === null) {
             throw new NonExistingRequestNameException(new Phrase("Request name '%1' doesn't exist.", [$requestName]));
         }