Merge pull request #152 from magento-api/MAGETWO-34416-Extension-Attributes-Squash

[API] Sprint 44 - Part 2 : MAGETWO-34416 Refactor Extensible Models and Objects to use Extended Attributes

Author: Tulika,Eugene(etulika)

.php_cs

@@ -15,7 +15,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->exclude('dev/tests/functional/vendor')
     ->exclude('dev/tests/integration/tmp')
     ->exclude('dev/tests/integration/var')
-    ->exclude('lib/internal/Apache')
     ->exclude('lib/internal/CardinalCommerce')
     ->exclude('lib/internal/Cm')
     ->exclude('lib/internal/Credis')

app/code/Magento/Bundle/Api/Data/LinkInterface.php

@@ -144,4 +144,19 @@ public function getCanChangeQuantity();
      * @return $this
      */
     public function setCanChangeQuantity($canChangeQuantity);
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return \Magento\Bundle\Api\Data\LinkExtensionInterface|null
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\Bundle\Api\Data\LinkExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(\Magento\Bundle\Api\Data\LinkExtensionInterface $extensionAttributes);
 }

app/code/Magento/Bundle/Api/Data/OptionInterface.php

@@ -113,4 +113,19 @@ public function getProductLinks();
      * @return $this
      */
     public function setProductLinks(array $productLinks = null);
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return \Magento\Bundle\Api\Data\OptionExtensionInterface|null
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\Bundle\Api\Data\OptionExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionExtensionInterface $extensionAttributes);
 }

app/code/Magento/Bundle/Api/Data/OptionTypeInterface.php

@@ -37,4 +37,19 @@ public function getCode();
      * @return $this
      */
     public function setCode($code);
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return \Magento\Bundle\Api\Data\OptionTypeExtensionInterface|null
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\Bundle\Api\Data\OptionTypeExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionTypeExtensionInterface $extensionAttributes);
 }

app/code/Magento/Bundle/Model/Link.php

@@ -7,6 +7,7 @@
 namespace Magento\Bundle\Model;
 
 /**
+ * Class Link
  * @codeCoverageIgnore
  */
 class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
@@ -196,4 +197,25 @@ public function setCanChangeQuantity($canChangeQuantity)
     {
         return $this->setData(self::KEY_CAN_CHANGE_QUANTITY, $canChangeQuantity);
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\Bundle\Api\Data\LinkExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\Bundle\Api\Data\LinkExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(\Magento\Bundle\Api\Data\LinkExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
 }

app/code/Magento/Bundle/Model/Option.php

@@ -269,5 +269,26 @@ public function setProductLinks(array $productLinks = null)
     {
         return $this->setData(self::KEY_PRODUCT_LINKS, $productLinks);
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\Bundle\Api\Data\OptionExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\Bundle\Api\Data\OptionExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
     //@codeCoverageIgnoreEnd
 }

app/code/Magento/Bundle/Model/Plugin/BundleLoadOptions.php

@@ -15,20 +15,21 @@ class BundleLoadOptions
     protected $productOptionList;
 
     /**
-     * @var \Magento\Framework\Api\AttributeValueFactory
+     * @var \Magento\Catalog\Api\Data\ProductExtensionFactory
      */
-    protected $customAttributeFactory;
+    protected $productExtensionFactory;
 
     /**
      * @param \Magento\Bundle\Model\Product\OptionList $productOptionList
-     * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
+     * @param \Magento\Framework\Api\AttributeDataBuilder $customAttributeBuilder
+     * @param \Magento\Catalog\Api\Data\ProductExtensionFactory $productExtensionFactory
      */
     public function __construct(
         \Magento\Bundle\Model\Product\OptionList $productOptionList,
-        \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
+        \Magento\Catalog\Api\Data\ProductExtensionFactory $productExtensionFactory
     ) {
         $this->productOptionList = $productOptionList;
-        $this->customAttributeFactory = $customAttributeFactory;
+        $this->productExtensionFactory = $productExtensionFactory;
     }
 
     /**
@@ -50,11 +51,12 @@ public function aroundLoad(
         if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
             return $product;
         }
-        $customAttribute = $this->customAttributeFactory->create()
-            ->setAttributeCode('bundle_product_options')
-            ->setValue($this->productOptionList->getItems($product));
-        $attributes = array_merge($product->getCustomAttributes(), ['bundle_product_options' => $customAttribute]);
-        $product->setData('custom_attributes', $attributes);
+
+        $productExtension = $this->productExtensionFactory->create();
+        $productExtension->setBundleProductOptions($this->productOptionList->getItems($product));
+
+        $product->setExtensionAttributes($productExtension);
+
         return $product;
     }
 }

app/code/Magento/Bundle/Model/Plugin/BundleSaveOptions.php

@@ -44,13 +44,8 @@ public function aroundSave(
             return $result;
         }
 
-        /* @var \Magento\Framework\Api\AttributeValue $bundleProductOptionsAttrValue */
-        $bundleProductOptionsAttrValue = $product->getCustomAttribute('bundle_product_options');
-        if (is_null($bundleProductOptionsAttrValue) || !is_array($bundleProductOptionsAttrValue->getValue())) {
-            $bundleProductOptions = [];
-        } else {
-            $bundleProductOptions = $bundleProductOptionsAttrValue->getValue();
-        }
+        /* @var \Magento\Bundle\Api\Data\OptionInterface[] $options */
+        $bundleProductOptions = $product->getExtensionAttributes()->getBundleProductOptions();
 
         if (is_array($bundleProductOptions)) {
             foreach ($bundleProductOptions as $option) {

app/code/Magento/Bundle/Model/Source/Option/Type.php

@@ -9,8 +9,12 @@
 namespace Magento\Bundle\Model\Source\Option;
 
 use Magento\Framework\Api\AttributeValueFactory;
-use Magento\Framework\Api\MetadataServiceInterface;
+use Magento\Framework\Api\ExtensionAttributesFactory;
 
+/**
+ * Class Type
+ *
+ */
 class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Framework\Option\ArrayInterface,
     \Magento\Bundle\Api\Data\OptionTypeInterface
@@ -30,7 +34,7 @@ class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param MetadataServiceInterface $metadataService
+     * @param ExtensionAttributesFactory $extensionFactory
      * @param AttributeValueFactory $customAttributeFactory
      * @param array $options
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -40,7 +44,7 @@ class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        MetadataServiceInterface $metadataService,
+        ExtensionAttributesFactory $extensionFactory,
         AttributeValueFactory $customAttributeFactory,
         array $options,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
@@ -51,7 +55,7 @@ public function __construct(
         parent::__construct(
             $context,
             $registry,
-            $metadataService,
+            $extensionFactory,
             $customAttributeFactory,
             $resource,
             $resourceCollection,
@@ -111,5 +115,26 @@ public function setCode($code)
     {
         return $this->setData(self::KEY_CODE, $code);
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\Bundle\Api\Data\OptionTypeExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\Bundle\Api\Data\OptionTypeExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionTypeExtensionInterface $extensionAttributes)
+    {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
     //@codeCoverageIgnoreEnd
 }

app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php

@@ -4,6 +4,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
+
 namespace Magento\Bundle\Test\Unit\Model;
 
 class OptionRepositoryTest extends \PHPUnit_Framework_TestCase
@@ -71,6 +74,7 @@ protected function setUp()
         $this->optionFactoryMock = $this->getMockBuilder('\Magento\Bundle\Api\Data\OptionInterfaceFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
+            ->disableOriginalConstructor()
             ->getMock();
         $this->dataObjectHelperMock = $this->getMockBuilder('\Magento\Framework\Api\DataObjectHelper')
             ->disableOriginalConstructor()