Merge branch 'graphql-issue-230' of github.com:magento-honey-badgers/magento2ce into graphql-issue-230

Author: cpartica

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoriesIdentityResolver.php renamed to app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoriesIdentity.php

@@ -7,20 +7,20 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Category;
 
-use Magento\Framework\GraphQl\Query\IdentityResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
 
 /**
  * Identity for multiple resolved categories
  */
-class CategoriesIdentityResolver implements IdentityResolverInterface
+class CategoriesIdentity implements IdentityInterface
 {
     /**
      * Get category IDs from resolved data
      *
      * @param array $resolvedData
      * @return array
      */
-    public function getIdentifiers(array $resolvedData): array
+    public function getIdentities(array $resolvedData): array
     {
         $ids = [];
         if (!empty($resolvedData)) {

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryTreeIdentityResolver.php renamed to app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CategoryTreeIdentity.php

@@ -7,20 +7,20 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Category;
 
-use Magento\Framework\GraphQl\Query\IdentityResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
 
 /**
  * Identity for resolved category
  */
-class CategoryTreeIdentityResolver implements IdentityResolverInterface
+class CategoryTreeIdentity implements IdentityInterface
 {
     /**
      * Get category ID from resolved data
      *
      * @param array $resolvedData
      * @return array
      */
-    public function getIdentifiers(array $resolvedData): array
+    public function getIdentities(array $resolvedData): array
     {
         return empty($resolvedData['id']) ? [] : [$resolvedData['id']];
     }

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/IdentityResolver.php renamed to app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Identity.php

@@ -7,20 +7,20 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Product;
 
-use Magento\Framework\GraphQl\Query\IdentityResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
 
 /**
  * Identity for resolved products
  */
-class IdentityResolver implements IdentityResolverInterface
+class Identity implements IdentityInterface
 {
     /**
      * Get product ids for cache tag
      *
      * @param array $resolvedData
      * @return array
      */
-    public function getIdentifiers(array $resolvedData): array
+    public function getIdentities(array $resolvedData): array
     {
         $ids = [];
         $items = $resolvedData['items'] ?? [];

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -9,11 +9,11 @@ type Query {
         currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1."),
         sort: ProductSortInput @doc(description: "Specifies which attribute to sort on, and whether to return the results in ascending or descending order.")
      ): Products
-     @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products") @doc(description: "The products query searches for products that match the criteria specified in the search and filter attributes") @cache(cacheTag: "cat_p", cacheIdentityResolver: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\IdentityResolver")
+     @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products") @doc(description: "The products query searches for products that match the criteria specified in the search and filter attributes") @cache(cacheTag: "cat_p", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Identity")
     category (
         id: Int @doc(description: "Id of the category")
     ): CategoryTree
-    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree") @doc(description: "The category query searches for categories that match the criteria specified in the search and filter attributes") @cache(cacheTag: "cat_c", cacheIdentityResolver: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryTreeIdentityResolver")
+    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree") @doc(description: "The category query searches for categories that match the criteria specified in the search and filter attributes") @cache(cacheTag: "cat_c", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryTreeIdentity")
 }
 
 enum CurrencyEnum @doc(description: "The list of available currency codes") {
@@ -275,7 +275,7 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
     price: ProductPrices @doc(description: "A ProductPrices object, indicating the price of an item") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Price")
     gift_message_available: String @doc(description: "Indicates whether a gift message is available")
     manufacturer: Int @doc(description: "A number representing the product's manufacturer")
-    categories: [CategoryInterface] @doc(description: "The categories assigned to a product") @cache(cacheTag: "cat_c", cacheIdentityResolver: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoriesIdentityResolver") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Categories")
+    categories: [CategoryInterface] @doc(description: "The categories assigned to a product") @cache(cacheTag: "cat_c", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoriesIdentity") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Categories")
     canonical_url: String @doc(description: "Canonical URL") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CanonicalUrl")
 }
 
@@ -396,7 +396,7 @@ interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model
         pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),
         currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1."),
         sort: ProductSortInput @doc(description: "Specifies which attribute to sort on, and whether to return the results in ascending or descending order.")
-    ): CategoryProducts @doc(description: "The list of products assigned to the category") @cache(cacheTag: "cat_p", cacheIdentityResolver: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\IdentityResolver") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Products")
+    ): CategoryProducts @doc(description: "The list of products assigned to the category") @cache(cacheTag: "cat_p", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Identity") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Products")
     breadcrumbs: [Breadcrumb] @doc(description: "Breadcrumbs, parent categories info") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Breadcrumbs")
 }
 

app/code/Magento/CmsGraphQl/Model/Resolver/Block/IdentityResolver.php renamed to app/code/Magento/CmsGraphQl/Model/Resolver/Block/Identity.php

@@ -8,20 +8,20 @@
 namespace Magento\CmsGraphQl\Model\Resolver\Block;
 
 use Magento\Cms\Api\Data\BlockInterface;
-use Magento\Framework\GraphQl\Query\IdentityResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
 
 /**
  * Identity for resolved CMS block
  */
-class IdentityResolver implements IdentityResolverInterface
+class Identity implements IdentityInterface
 {
     /**
-     * Get block identifiers from resolved data
+     * Get block identities from resolved data
      *
      * @param array $resolvedData
      * @return array
      */
-    public function getIdentifiers(array $resolvedData): array
+    public function getIdentities(array $resolvedData): array
     {
         $ids = [];
         $items = $resolvedData['items'] ?? [];

app/code/Magento/CmsGraphQl/Model/Resolver/Page/IdentityResolver.php renamed to app/code/Magento/CmsGraphQl/Model/Resolver/Page/Identity.php

@@ -8,20 +8,20 @@
 namespace Magento\CmsGraphQl\Model\Resolver\Page;
 
 use Magento\Cms\Api\Data\PageInterface;
-use Magento\Framework\GraphQl\Query\IdentityResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
 
 /**
  * Identity for resolved CMS page
  */
-class IdentityResolver implements IdentityResolverInterface
+class Identity implements IdentityInterface
 {
     /**
      * Get page ID from resolved data
      *
      * @param array $resolvedData
      * @return array
      */
-    public function getIdentifiers(array $resolvedData): array
+    public function getIdentities(array $resolvedData): array
     {
         return empty($resolvedData[PageInterface::PAGE_ID]) ? [] : [$resolvedData[PageInterface::PAGE_ID]];
     }

app/code/Magento/CmsGraphQl/etc/schema.graphqls

@@ -13,10 +13,10 @@ type StoreConfig @doc(description: "The type contains information about a store
 type Query {
     cmsPage (
         id: Int @doc(description: "Id of the CMS page")
-    ): CmsPage @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Page") @doc(description: "The CMS page query returns information about a CMS page") @cache(cacheTag: "cms_p", cacheIdentityResolver: "Magento\\CmsGraphQl\\Model\\Resolver\\Page\\IdentityResolver")
+    ): CmsPage @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Page") @doc(description: "The CMS page query returns information about a CMS page") @cache(cacheTag: "cms_p", cacheIdentity: "Magento\\CmsGraphQl\\Model\\Resolver\\Page\\Identity")
     cmsBlocks (
         identifiers: [String] @doc(description: "Identifiers of the CMS blocks")
-    ): CmsBlocks @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Blocks") @doc(description: "The CMS block query returns information about CMS blocks") @cache(cacheTag: "cms_b", cacheIdentityResolver: "Magento\\CmsGraphQl\\Model\\Resolver\\Block\\IdentityResolver")
+    ): CmsBlocks @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Blocks") @doc(description: "The CMS block query returns information about CMS blocks") @cache(cacheTag: "cms_b", cacheIdentity: "Magento\\CmsGraphQl\\Model\\Resolver\\Block\\Identity")
 }
 
 type CmsPage @doc(description: "CMS page defines all CMS page information") {

app/code/Magento/GraphQlCache/Model/CacheableQueryHandler.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\App\RequestInterface;
+use Magento\GraphQlCache\Model\Resolver\IdentityPool;
 
 /**
  * Handler of collecting tagging on cache.
@@ -29,23 +30,23 @@ class CacheableQueryHandler
     private $request;
 
     /**
-     * @var IdentityResolverPool
+     * @var IdentityPool
      */
-    private $identityResolverPool;
+    private $identityPool;
 
     /**
      * @param CacheableQuery $cacheableQuery
      * @param RequestInterface $request
-     * @param IdentityResolverPool $identityResolverPool
+     * @param IdentityPool $identityPool
      */
     public function __construct(
         CacheableQuery $cacheableQuery,
         RequestInterface $request,
-        IdentityResolverPool $identityResolverPool
+        IdentityPool $identityPool
     ) {
         $this->cacheableQuery = $cacheableQuery;
         $this->request = $request;
-        $this->identityResolverPool = $identityResolverPool;
+        $this->identityPool = $identityPool;
     }
 
     /**
@@ -58,15 +59,15 @@ public function __construct(
     public function handleCacheFromResolverResponse(array $resolvedValue, Field $field) : void
     {
         $cache = $field->getCache();
-        $cacheIdentityResolverClass = $cache['cacheIdentityResolver'] ?? '';
+        $cacheIdentityClass = $cache['cacheIdentity'] ?? '';
         $cacheable = $cache['cacheable'] ?? true;
         $cacheTag = $cache['cacheTag'] ?? null;
 
         $cacheTags = [];
         if ($cacheTag && $this->request->isGet()) {
-            if (!empty($cacheIdentityResolverClass)) {
-                $cacheIdentityResolver = $this->identityResolverPool->get($cacheIdentityResolverClass);
-                $cacheTagIds = $cacheIdentityResolver->getIdentifiers($resolvedValue);
+            if (!empty($cacheIdentityClass)) {
+                $cacheIdentity = $this->identityPool->get($cacheIdentityClass);
+                $cacheTagIds = $cacheIdentity->getIdentities($resolvedValue);
                 if (!empty($cacheTagIds)) {
                     $cacheTags[] = $cacheTag;
                     foreach ($cacheTagIds as $cacheTagId) {

app/code/Magento/GraphQlCache/Model/IdentityResolverPool.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQlCache\Model\Resolver;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
+
+/**
+ * Pool of IdentityInterface objects
+ */
+class IdentityPool
+{
+    /**
+     * @var IdentityInterface[]
+     */
+    private $identityInstances = [];
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Get an identity resolver by class name
+     *
+     * @param string $identityClass
+     * @return IdentityInterface
+     */
+    public function get(string $identityClass): IdentityInterface
+    {
+        if (!isset($this->identityInstances[$identityClass])) {
+            $this->identityInstances[$identityClass] = $this->objectManager->create($identityClass);
+        }
+        return $this->identityInstances[$identityClass];
+    }
+}