B2B-2931: [Graphql Resolver Cache] improve reliability and developer awareness on cache keyspace

Author: rganin

app/code/Magento/CmsGraphQl/etc/graphql/di.xml

@@ -32,7 +32,7 @@
     </type>
     <type name="Magento\GraphQlResolverCache\Model\Resolver\Result\CacheKey\Calculator\Provider">
         <arguments>
-            <argument name="customFactorProviders" xsi:type="array">
+            <argument name="factorProviders" xsi:type="array">
                 <item name="Magento\CmsGraphQl\Model\Resolver\Page" xsi:type="array">
                     <item name="currency" xsi:type="string">Magento\StoreGraphQl\Model\Resolver\CacheKey\FactorProvider\Currency</item>
                     <item name="store" xsi:type="string">Magento\StoreGraphQl\Model\Resolver\CacheKey\FactorProvider\Store</item>

app/code/Magento/CustomerGraphQl/etc/graphql/di.xml

@@ -204,7 +204,7 @@
     </type>
     <type name="Magento\GraphQlResolverCache\Model\Resolver\Result\CacheKey\Calculator\Provider">
         <arguments>
-            <argument name="customFactorProviders" xsi:type="array">
+            <argument name="factorProviders" xsi:type="array">
                 <item name="Magento\CustomerGraphQl\Model\Resolver\Customer" xsi:type="array">
                     <item name="current_customer_id" xsi:type="string">Magento\CustomerGraphQl\Model\Resolver\CacheKey\FactorProvider\CurrentCustomerId</item>
                 </item>

app/code/Magento/GraphQlResolverCache/Model/Resolver/Result/CacheKey/Calculator/Provider.php

@@ -19,7 +19,7 @@ class Provider implements ProviderInterface
     /**
      * @var array
      */
-    private array $customFactorProviders = [];
+    private array $factorProviders = [];
 
     /**
      * @var array
@@ -33,14 +33,14 @@ class Provider implements ProviderInterface
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @param array $customFactorProviders
+     * @param array $factorProviders
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        array $customFactorProviders = []
+        array $factorProviders = []
     ) {
         $this->objectManager = $objectManager;
-        $this->customFactorProviders = $customFactorProviders;
+        $this->factorProviders = $factorProviders;
     }
 
     /**
@@ -56,7 +56,7 @@ private function initForResolver(ResolverInterface $resolver): void
         if (isset($this->keyCalculatorInstances[$resolverClass])) {
             return;
         }
-        $customKeyFactorProviders = $this->getCustomFactorProvidersForResolver($resolver);
+        $customKeyFactorProviders = $this->getFactorProvidersForResolver($resolver);
         if ($customKeyFactorProviders === null) {
             throw new \InvalidArgumentException(
                 "Key factors are not determined for {$resolverClass} or its parents." .
@@ -123,14 +123,14 @@ private function getResolverClassChain(ResolverInterface $resolver): array
      * @param ResolverInterface $resolver
      * @return array|null
      */
-    private function getCustomFactorProvidersForResolver(ResolverInterface $resolver): ?array
+    private function getFactorProvidersForResolver(ResolverInterface $resolver): ?array
     {
         $resultsToMerge = [];
         foreach ($this->getResolverClassChain($resolver) as $resolverClass) {
-            if (isset($this->customFactorProviders[$resolverClass])
-                && is_array($this->customFactorProviders[$resolverClass])
+            if (isset($this->factorProviders[$resolverClass])
+                && is_array($this->factorProviders[$resolverClass])
             ) {
-                $resultsToMerge []= $this->customFactorProviders[$resolverClass];
+                $resultsToMerge []= $this->factorProviders[$resolverClass];
             }
         }
         // avoid using array_merge in a loop

dev/tests/integration/testsuite/Magento/GraphQlResolverCache/Model/Plugin/Resolver/CacheTest.php

@@ -170,7 +170,7 @@ private function preconfigureMocks()
             [
                 \Magento\GraphQlResolverCache\Model\Resolver\Result\CacheKey\Calculator\Provider::class => [
                     'arguments' => [
-                        'customFactorProviders' => [
+                        'factorProviders' => [
                             \Magento\StoreGraphQl\Model\Resolver\StoreConfigResolver::class => [
                                 'test_failing' => 'TestFailingKeyFactor'
                             ]

dev/tests/integration/testsuite/Magento/GraphQlResolverCache/Model/Resolver/Result/Cache/KeyCalculator/ProviderTest.php

@@ -75,7 +75,7 @@ public function testProviderEmptyConfig()
         $this->provider = $this->objectManager->create(
             Provider::class,
             [
-                'customFactorProviders' => [
+                'factorProviders' => [
                     'Magento\StoreGraphQl\Model\Resolver\StoreConfigResolver' => [],
                 ]
             ]
@@ -97,7 +97,7 @@ public function testProviderEmptyConfig()
     public function testProviderKeyFactorsConfigured()
     {
         $this->provider = $this->objectManager->create(Provider::class, [
-                'customFactorProviders' => [
+                'factorProviders' => [
                     'Magento\StoreGraphQl\Model\Resolver\StoreConfigResolver' => [
                         'store' => 'Magento\StoreGraphQl\Model\Resolver\CacheKey\FactorProvider\Store',
                         'currency' => 'Magento\StoreGraphQl\Model\Resolver\CacheKey\FactorProvider\Currency'
@@ -155,7 +155,7 @@ public function testProviderSameKeyCalculatorsForDifferentResolvers()
         $this->provider = $this->objectManager->create(
             Provider::class,
             [
-                'customFactorProviders' => [
+                'factorProviders' => [
                     'Magento\CustomerGraphQl\Model\Resolver\Customer' => [
                         'customer_id' =>
                             'Magento\CustomerGraphQl\Model\Resolver\CacheKey\FactorProvider\CurrentCustomerId',
@@ -192,7 +192,7 @@ public function testProviderSameKeyCalculatorsForDifferentResolvers()
     public function testProviderDifferentKeyCalculatorsForDifferentResolvers()
     {
         $this->provider = $this->objectManager->create(Provider::class, [
-                'customFactorProviders' => [
+                'factorProviders' => [
                     'Magento\CustomerGraphQl\Model\Resolver\Customer' => [
                         'customer_id' =>
                             'Magento\CustomerGraphQl\Model\Resolver\Cache\KeyFactorProvider\CurrentCustomerId',