MAGETWO-38823: Stabilize builds

- Rename user interface

Author: Bryant Luk

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/etc/extension_attributes.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../../../lib/internal/Magento/Framework/Api/etc/extension_attributes.xsd">
     <extension_attributes for="Magento\Quote\Api\Data\CartInterface">
-        <attribute code="quoteApiTestAttribute" type="Magento\User\Model\UserInterface">
+        <attribute code="quoteApiTestAttribute" type="Magento\User\Api\Data\UserInterface">
             <join reference_table="admin_user"
                   join_on_field="store_id"
                   reference_field="user_id"
@@ -20,7 +20,7 @@
         </attribute>
     </extension_attributes>
     <extension_attributes for="Magento\Sales\Api\Data\InvoiceInterface">
-        <attribute code="invoiceApiTestAttribute" type="Magento\User\Model\UserInterface">
+        <attribute code="invoiceApiTestAttribute" type="Magento\User\Api\Data\UserInterface">
             <join reference_table="admin_user"
                   join_on_field="store_id"
                   reference_field="user_id"

dev/tests/integration/testsuite/Magento/Downloadable/Model/Product/TypeTest.php

@@ -140,7 +140,7 @@ public function testSaveTypeSpecificData()
         $this->assertCount(1, $links);
         /** @var \Magento\Downloadable\Model\Link $link */
         $link = reset($links);
-        /** @var \Magento\User\Model\UserInterface $testAttribute */
+        /** @var \Magento\User\Api\Data\UserInterface $testAttribute */
         $testAttribute = $link->getExtensionAttributes()->getTestAttribute();
         $this->assertEquals($expectedExtensionAttributes['firstname'], $testAttribute->getFirstName());
         $this->assertEquals($expectedExtensionAttributes['lastname'], $testAttribute->getLastName());
@@ -167,7 +167,7 @@ public function testSaveTypeSpecificData()
         $this->assertEquals(1, $samples->count());
         /** @var \Magento\Downloadable\Model\Sample $sample */
         $sample = $samples->getFirstItem()->getData();
-        /** @var \Magento\User\Model\UserInterface $testAttribute */
+        /** @var \Magento\User\Api\Data\UserInterface $testAttribute */
         $testAttribute = $sample['extension_attributes']->getTestAttribute();
         $this->assertEquals($expectedExtensionAttributes['firstname'], $testAttribute->getFirstName());
         $this->assertEquals($expectedExtensionAttributes['lastname'], $testAttribute->getLastName());

dev/tests/integration/testsuite/Magento/Downloadable/etc/extension_attributes.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Api/etc/extension_attributes.xsd">
     <extension_attributes for="Magento\Downloadable\Api\Data\LinkInterface">
-        <attribute code="testAttribute" type="Magento\User\Model\UserInterface">
+        <attribute code="testAttribute" type="Magento\User\Api\Data\UserInterface">
             <join reference_table="admin_user"
                   join_on_field="product_id"
                   reference_field="user_id"
@@ -20,7 +20,7 @@
         </attribute>
     </extension_attributes>
     <extension_attributes for="Magento\Downloadable\Api\Data\SampleInterface">
-        <attribute code="testAttribute" type="Magento\User\Model\UserInterface">
+        <attribute code="testAttribute" type="Magento\User\Api\Data\UserInterface">
             <join reference_table="admin_user"
                   join_on_field="product_id"
                   reference_field="user_id"

dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/RepositoryTest.php

@@ -31,7 +31,7 @@ public function testGetList()
         /** @var \Magento\Quote\Api\Data\CartItemInterface $actualQuoteItem */
         $actualQuoteItem = array_pop($quoteItems);
         $this->assertInstanceOf('Magento\Quote\Api\Data\CartItemInterface', $actualQuoteItem);
-        /** @var \Magento\User\Model\UserInterface $testAttribute */
+        /** @var \Magento\User\Api\Data\UserInterface $testAttribute */
         $testAttribute = $actualQuoteItem->getExtensionAttributes()->getQuoteItemTestAttribute();
         $this->assertEquals($expectedExtensionAttributes['firstname'], $testAttribute->getFirstName());
         $this->assertEquals($expectedExtensionAttributes['lastname'], $testAttribute->getLastName());

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php

@@ -31,7 +31,7 @@ public function testGetList()
         $actualQuote = array_pop($items);
         $this->assertInstanceOf('Magento\Quote\Api\Data\CartInterface', $actualQuote);
         $this->assertEquals('test01', $actualQuote->getReservedOrderId());
-        /** @var \Magento\User\Model\UserInterface $testAttribute */
+        /** @var \Magento\User\Api\Data\UserInterface $testAttribute */
         $testAttribute = $actualQuote->getExtensionAttributes()->getQuoteTestAttribute();
         $this->assertEquals($expectedExtensionAttributes['firstname'], $testAttribute->getFirstName());
         $this->assertEquals($expectedExtensionAttributes['lastname'], $testAttribute->getLastName());

dev/tests/integration/testsuite/Magento/Quote/etc/extension_attributes.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Api/etc/extension_attributes.xsd">
     <extension_attributes for="Magento\Quote\Api\Data\CartInterface">
-        <attribute code="quoteTestAttribute" type="Magento\User\Model\UserInterface">
+        <attribute code="quoteTestAttribute" type="Magento\User\Api\Data\UserInterface">
             <join reference_table="admin_user"
                   join_on_field="store_id"
                   reference_field="user_id"
@@ -20,7 +20,7 @@
         </attribute>
     </extension_attributes>
     <extension_attributes for="Magento\Quote\Api\Data\CartItemInterface">
-        <attribute code="quoteItemTestAttribute" type="Magento\User\Model\UserInterface">
+        <attribute code="quoteItemTestAttribute" type="Magento\User\Api\Data\UserInterface">
             <join reference_table="admin_user"
                   join_on_field="store_id"
                   reference_field="user_id"