Merge remote-tracking branch 'origin/MAGETWO-36000-Join-Processors' into MAGETWO-36000-Join-Processors

Author: Cari Spruiell

app/code/Magento/Catalog/Api/Data/ProductCustomOptionInterface.php

@@ -201,4 +201,21 @@ public function getValues();
      * @return $this
      */
     public function setValues(array $values = null);
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface|null
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface $extensionAttributes
+    );
 }

app/code/Magento/Catalog/Model/Product/Option.php

@@ -852,4 +852,26 @@ public function setValues(array $values = null)
         return $this;
     }
     //@codeCoverageIgnoreEnd
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface $extensionAttributes
+    ) {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
 }

app/code/Magento/Tax/Model/Calculation/RateRepository.php

@@ -65,6 +65,11 @@ class RateRepository implements \Magento\Tax\Api\TaxRateRepositoryInterface
      */
     protected $resourceModel;
 
+    /**
+     * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
+     */
+    protected $joinProcessor;
+
     /**
      * @param Converter $converter
      * @param RateRegistry $rateRegistry
@@ -73,6 +78,7 @@ class RateRepository implements \Magento\Tax\Api\TaxRateRepositoryInterface
      * @param CountryFactory $countryFactory
      * @param RegionFactory $regionFactory
      * @param \Magento\Tax\Model\Resource\Calculation\Rate $rateResource
+     * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      */
     public function __construct(
         Converter $converter,
@@ -81,7 +87,8 @@ public function __construct(
         RateFactory $rateFactory,
         CountryFactory $countryFactory,
         RegionFactory $regionFactory,
-        \Magento\Tax\Model\Resource\Calculation\Rate $rateResource
+        \Magento\Tax\Model\Resource\Calculation\Rate $rateResource,
+        \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
     ) {
         $this->converter = $converter;
         $this->rateRegistry = $rateRegistry;
@@ -90,6 +97,7 @@ public function __construct(
         $this->countryFactory = $countryFactory;
         $this->regionFactory = $regionFactory;
         $this->resourceModel = $rateResource;
+        $this->joinProcessor = $joinProcessor;
     }
 
     /**
@@ -146,6 +154,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
     {
         /** @var \Magento\Tax\Model\Resource\Calculation\Rate\Collection $collection */
         $collection = $this->rateFactory->create()->getCollection();
+        $this->joinProcessor->process($collection);
         $collection->joinRegionTable();
 
         //Add filters from root filter group to the collection

app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php

@@ -59,6 +59,11 @@ class RateRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     private $rateResourceMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $joinProcessorMock;
+
     public function setUp()
     {
         $this->rateConverterMock = $this->getMock(
@@ -117,14 +122,22 @@ public function setUp()
             '',
             false
         );
+        $this->joinProcessorMock = $this->getMock(
+            'Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface',
+            [],
+            [],
+            '',
+            false
+        );
         $this->model = new RateRepository(
             $this->rateConverterMock,
             $this->rateRegistryMock,
             $this->searchResultFactory,
             $this->rateFactoryMock,
             $this->countryFactoryMock,
             $this->regionFactoryMock,
-            $this->rateResourceMock
+            $this->rateResourceMock,
+            $this->joinProcessorMock
         );
     }
 
@@ -256,6 +269,8 @@ public function testGetList()
             ->willReturnSelf();
         $this->searchResultFactory->expects($this->once())->method('create')->willReturn($this->searchResultMock);
 
+        $this->joinProcessorMock->expects($this->once())->method('process')->with($collectionMock);
+
         $this->model->getList($searchCriteriaMock);
     }
 
@@ -402,6 +417,8 @@ public function testGetListWhenFilterGroupExists()
             ->willReturnSelf();
         $this->searchResultFactory->expects($this->once())->method('create')->willReturn($this->searchResultMock);
 
+        $this->joinProcessorMock->expects($this->once())->method('process')->with($collectionMock);
+
         $this->model->getList($searchCriteriaMock);
     }
 

app/code/Magento/Tax/Test/Unit/Model/TaxClass/RepositoryTest.php

@@ -52,7 +52,6 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $extensionAttributesJoinProcessorMock;
 
-    /**
     /**
      * @return void
      */

app/code/Magento/User/Model/UserInterface.php renamed to app/code/Magento/User/Api/Data/UserInterface.php

@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\User\Model;
+namespace Magento\User\Api\Data;
 
 /**
  * Admin user interface.
@@ -14,119 +14,119 @@ interface UserInterface
 {
     /**
      * Get ID.
-     * 
+     *
      * @return int
      */
     public function getId();
-    
+
     /**
      * Set ID.
-     * 
+     *
      * @param int $id
      * @return $this
      */
     public function setId($id);
-    
+
     /**
      * Get first name.
-     * 
+     *
      * @return string
      */
     public function getFirstName();
-    
+
     /**
      * Set first name.
-     * 
+     *
      * @param string $firstName
      * @return $this
      */
     public function setFirstName($firstName);
-    
+
     /**
      * Get last name.
-     * 
+     *
      * @return string
      */
     public function getLastName();
-    
+
     /**
      * Set last name.
-     * 
+     *
      * @param string $lastName
      * @return $this
      */
     public function setLastName($lastName);
-    
+
     /**
      * Get email.
-     * 
+     *
      * @return string
      */
     public function getEmail();
-    
+
     /**
      * Set email.
-     * 
+     *
      * @param string $email
      * @return $this
      */
     public function setEmail($email);
-    
+
     /**
      * Get user name.
-     * 
+     *
      * @return string
      */
     public function getUserName();
-    
+
     /**
      * Set user name.
-     * 
+     *
      * @param string $userName
      * @return $this
      */
     public function setUserName($userName);
-    
+
     /**
      * Get password or password hash.
-     * 
+     *
      * @return string
      */
     public function getPassword();
-    
+
     /**
      * Set password or password hash.
-     * 
+     *
      * @param string $password
      * @return $this
      */
     public function setPassword($password);
-    
+
     /**
      * Get user record creation date.
-     * 
+     *
      * @return string
      */
     public function getCreated();
-    
+
     /**
      * Set user record creation date.
-     * 
+     *
      * @param string $created
      * @return $this
      */
     public function setCreated($created);
-    
+
     /**
      * Get user record modification date.
-     * 
+     *
      * @return string
      */
     public function getModified();
-    
+
     /**
      * Set user record modification date.
-     * 
+     *
      * @param string $modified
      * @return $this
      */

app/code/Magento/User/Model/User.php

@@ -8,6 +8,7 @@
 use Magento\Backend\Model\Auth\Credential\StorageInterface;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\User\Api\Data\UserInterface;
 
 /**
  * Admin user model

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

@@ -14,5 +14,5 @@
     <type name="Magento\Authorization\Model\Role">
         <plugin name="updateRoleUsersAcl" type="Magento\User\Model\Plugin\AuthorizationRole" sortOrder="20"/>
     </type>
-    <preference for="Magento\User\Model\UserInterface" type="Magento\User\Model\User" />
+    <preference for="Magento\User\Api\Data\UserInterface" type="Magento\User\Model\User" />
 </config>

dev/tests/api-functional/_files/Magento/TestJoinDirectives/Model/TestRepository.php

@@ -11,35 +11,35 @@
 /**
  * Model TestRepository
  */
-class  TestRepository implements TestRepositoryInterface
+class TestRepository implements TestRepositoryInterface
 {
     /**
-     * @var \Magento\Quote\Model\Resource\Quote\Collection
+     * @var \Magento\Quote\Model\Resource\Quote\CollectionFactory
      */
-    protected $quoteCollection;
+    private $quoteCollectionFactory;
 
     /**
      * @var \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory
      */
-    protected $searchResultsDataFactory;
+    private $searchResultsDataFactory;
 
     /**
      * @var JoinProcessorInterface
      */
     private $extensionAttributesJoinProcessor;
 
     /**
-     * @param \Magento\Quote\Model\Resource\Quote\Collection $quoteCollection
+     * @param \Magento\Quote\Model\Resource\Quote\CollectionFactory $quoteCollectionFactory
      * @param \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory $searchResultsDataFactory
      * @param JoinProcessorInterface $extensionAttributesJoinProcessor
      */
     public function __construct(
-        \Magento\Quote\Model\Resource\Quote\Collection $quoteCollection,
+        \Magento\Quote\Model\Resource\Quote\CollectionFactory $quoteCollectionFactory,
         \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory $searchResultsDataFactory,
         JoinProcessorInterface $extensionAttributesJoinProcessor
     ) {
+        $this->quoteCollectionFactory = $quoteCollectionFactory;
         $this->searchResultsDataFactory = $searchResultsDataFactory;
-        $this->quoteCollection = $quoteCollection;
         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
     }
 
@@ -48,10 +48,11 @@ public function __construct(
      */
     public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
     {
+        $quoteCollection = $this->quoteCollectionFactory->create();
+        $this->extensionAttributesJoinProcessor->process($quoteCollection);
         $searchData = $this->searchResultsDataFactory->create();
         $searchData->setSearchCriteria($searchCriteria);
-        $this->extensionAttributesJoinProcessor->process($this->quoteCollection);
-        $searchData->setItems($this->quoteCollection->getItems());
+        $searchData->setItems($quoteCollection->getItems());
         return $searchData;
     }
 }