MAGETWO-38296: [Add join processors to search service] UI Module

- Reverting join processor for UI module

Author: anupdugar

app/code/Magento/Ui/Api/Data/BookmarkInterface.php

@@ -7,23 +7,22 @@
 
 /**
  * Bookmark page interface.
- *
  * @api
  */
-interface BookmarkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
+interface BookmarkInterface
 {
     /**#@+
      * Constants for keys of data array. Identical to the name of the getter in snake case
      */
-    const BOOKMARK_ID = 'bookmark_id';
-    const USER_ID = 'user_id';
-    const BOOKMARKSPACE = 'namespace';
-    const IDENTIFIER = 'identifier';
-    const TITLE = 'title';
-    const CONFIG = 'config';
-    const CREATED_AT = 'created_at';
-    const UPDATED_AT = 'updated_at';
-    const CURRENT = 'current';
+    const BOOKMARK_ID      = 'bookmark_id';
+    const USER_ID          = 'user_id';
+    const BOOKMARKSPACE    = 'namespace';
+    const IDENTIFIER       = 'identifier';
+    const TITLE            = 'title';
+    const CONFIG           = 'config';
+    const CREATED_AT       = 'created_at';
+    const UPDATED_AT       = 'updated_at';
+    const CURRENT          = 'current';
     /**#@-*/
 
     /**
@@ -160,19 +159,4 @@ public function setUpdatedAt($updatedAt);
      * @return \Magento\Ui\Api\Data\BookmarkInterface
      */
     public function setCurrent($isCurrent);
-
-    /**
-     * Retrieve existing extension attributes object or create a new one.
-     *
-     * @return \Magento\Ui\Api\Data\BookmarkExtensionInterface|null
-     */
-    public function getExtensionAttributes();
-
-    /**
-     * Set an extension attributes object.
-     *
-     * @param \Magento\Ui\Api\Data\BookmarkExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(\Magento\Ui\Api\Data\BookmarkExtensionInterface $extensionAttributes);
 }

app/code/Magento/Ui/Model/Bookmark.php

@@ -5,16 +5,19 @@
  */
 namespace Magento\Ui\Model;
 
-use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Json\Decoder;
 use Magento\Framework\Json\Encoder;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Registry;
 use Magento\Ui\Api\Data\BookmarkInterface;
+use Magento\Ui\Model\Resource\Bookmark\Collection;
 use Magento\Ui\Model\Resource\Bookmark as ResourceBookmark;
 
 /**
  * Domain class Bookmark
  */
-class Bookmark extends \Magento\Framework\Model\AbstractExtensibleModel implements BookmarkInterface
+class Bookmark extends AbstractModel implements BookmarkInterface
 {
     /**
      * @var Encoder
@@ -27,48 +30,26 @@ class Bookmark extends \Magento\Framework\Model\AbstractExtensibleModel implemen
     protected $jsonDecoder;
 
     /**
-     * @param \Magento\Framework\Model\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
-     * @param AttributeValueFactory $customAttributeFactory
      * @param Encoder $jsonEncoder
      * @param Decoder $jsonDecoder
-     * @param \Magento\Framework\Model\Resource\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param Context $context
+     * @param Registry $registry
+     * @param ResourceBookmark $resource
+     * @param Collection $resourceCollection
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory,
-        AttributeValueFactory $customAttributeFactory,
+        Context $context,
+        Registry $registry,
+        ResourceBookmark $resource,
+        Collection $resourceCollection,
         Encoder $jsonEncoder,
         Decoder $jsonDecoder,
-        \Magento\Framework\Model\Resource\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->jsonEncoder = $jsonEncoder;
         $this->jsonDecoder = $jsonDecoder;
-        parent::__construct(
-            $context,
-            $registry,
-            $extensionFactory,
-            $customAttributeFactory,
-            $resource,
-            $resourceCollection,
-            $data
-        );
-    }
-
-    /**
-     * Initialize bookmark model
-     *
-     * @return void
-     */
-    public function _construct()
-    {
-        $this->_init('Magento\Ui\Model\Resource\Bookmark');
+        parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
     /**
@@ -259,25 +240,4 @@ public function setUpdatedAt($updatedAt)
     {
         return $this->setData(self::UPDATED_AT, $updatedAt);
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Ui\Api\Data\BookmarkExtensionInterface|null
-     */
-    public function getExtensionAttributes()
-    {
-        return $this->_getExtensionAttributes();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Ui\Api\Data\BookmarkExtensionInterface $extensionAttributes
-     * @return $this
-     */
-    public function setExtensionAttributes(\Magento\Ui\Api\Data\BookmarkExtensionInterface $extensionAttributes)
-    {
-        return $this->_setExtensionAttributes($extensionAttributes);
-    }
 }

app/code/Magento/Ui/Model/Resource/BookmarkRepository.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Ui\Model\Resource;
 
-use Magento\Ui\Model\Resource\Bookmark\CollectionFactory as BookmarkCollectionFactory;
-use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Ui\Api\BookmarkRepositoryInterface;
 use Magento\Framework\Api\Search\FilterGroup;
@@ -23,13 +21,6 @@
  */
 class BookmarkRepository implements BookmarkRepositoryInterface
 {
-    /**
-     * Collection factory.
-     *
-     * @var BookmarkCollectionFactory
-     */
-    private $collectionFactory;
-
     /**
      * @var \Magento\Ui\Model\BookmarkFactory
      */
@@ -46,29 +37,19 @@ class BookmarkRepository implements BookmarkRepositoryInterface
     protected $searchResultsFactory;
 
     /**
-     * @var JoinProcessorInterface
-     */
-    private $extensionAttributesJoinProcessor;
-
-    /**
-     * @param BookmarkCollectionFactory $collectionFactory Collection factory.
      * @param \Magento\Ui\Model\BookmarkFactory $bookmarkFactory
      * @param Bookmark $bookmarkResourceModel
      * @param \Magento\Ui\Api\Data\BookmarkSearchResultsInterfaceFactory $searchResultsFactory
-     * @param JoinProcessorInterface $extensionAttributesJoinProcessor
      */
     public function __construct(
-        BookmarkCollectionFactory $collectionFactory,
         \Magento\Ui\Model\BookmarkFactory $bookmarkFactory,
         \Magento\Ui\Model\Resource\Bookmark $bookmarkResourceModel,
-        \Magento\Ui\Api\Data\BookmarkSearchResultsInterfaceFactory $searchResultsFactory,
-        JoinProcessorInterface $extensionAttributesJoinProcessor
+        \Magento\Ui\Api\Data\BookmarkSearchResultsInterfaceFactory $searchResultsFactory
     ) {
-        $this->collectionFactory = $collectionFactory;
+
         $this->bookmarkResourceModel = $bookmarkResourceModel;
         $this->bookmarkFactory = $bookmarkFactory;
         $this->searchResultsFactory = $searchResultsFactory;
-        $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
     }
 
     /**
@@ -118,8 +99,7 @@ public function getList(SearchCriteriaInterface $searchCriteria)
         $searchResults->setSearchCriteria($searchCriteria);
 
         /** @var \Magento\Ui\Model\Resource\Bookmark\Collection $collection */
-        $collection = $this->collectionFactory->create();
-        $this->extensionAttributesJoinProcessor->process($collection);
+        $collection = $this->bookmarkFactory->create()->getCollection();
         // Add filters from root filter group to the collection
         foreach ($searchCriteria->getFilterGroups() as $group) {
             $this->addFilterGroupToCollection($group, $collection);