MAGETWO-28256: Bundle Integration API Refactoring

    - Removed duplicate method is_defined from LinkInterface
    - Check extension attributes fields is not null

Author: Yu Tang

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

@@ -87,21 +87,6 @@ public function getPosition();
      */
     public function setPosition($position);
 
-    /**
-     * Get is defined
-     *
-     * @return bool|null
-     */
-    public function getIsDefined();
-
-    /**
-     * Set is defined
-     *
-     * @param bool $isDefined
-     * @return $this
-     */
-    public function setIsDefined($isDefined);
-
     /**
      * Get is default
      *

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

@@ -21,11 +21,10 @@ class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
     const KEY_OPTION_ID = 'option_id';
     const KEY_QTY = 'qty';
     const KEY_POSITION = 'position';
-    const KEY_IS_DEFINED = 'is_defined';
     const KEY_IS_DEFAULT = 'is_default';
     const KEY_PRICE = 'price';
     const KEY_PRICE_TYPE = 'price_type';
-    const KEY_CAN_CHANGE_QUANTITY = 'can_change_quantity';
+    const KEY_CAN_CHANGE_QUANTITY = 'selection_can_change_quantity';
     /**#@-*/
 
     /**
@@ -77,14 +76,6 @@ public function getPosition()
         return $this->getData(self::KEY_POSITION);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getIsDefined()
-    {
-        return $this->getData(self::KEY_IS_DEFINED);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -161,17 +152,6 @@ public function setPosition($position)
         return $this->setData(self::KEY_POSITION, $position);
     }
 
-    /**
-     * Set is defined
-     *
-     * @param bool $isDefined
-     * @return $this
-     */
-    public function setIsDefined($isDefined)
-    {
-        return $this->setData(self::KEY_IS_DEFINED, $isDefined);
-    }
-
     /**
      * Set is default
      *

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

@@ -324,7 +324,7 @@ private function buildLink(\Magento\Catalog\Model\Product $selection, \Magento\C
         $link->setIsDefault($selection->getIsDefault())
             ->setId($selection->getSelectionId())
             ->setQty($selection->getSelectionQty())
-            ->setIsDefined($selection->getSelectionCanChangeQty())
+            ->setCanChangeQuantity($selection->getSelectionCanChangeQty())
             ->setPrice($selectionPrice)
             ->setPriceType($selectionPriceType);
         return $link;

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

@@ -46,7 +46,11 @@ public function aroundSave(
         }
 
         /* @var \Magento\Bundle\Api\Data\OptionInterface[] $options */
-        $bundleProductOptions = $product->getExtensionAttributes()->getBundleProductOptions();
+        $extendedAttributes = $product->getExtensionAttributes();
+        if ($extendedAttributes === null) {
+            return $result;
+        }
+        $bundleProductOptions = $extendedAttributes->getBundleProductOptions();
         if ($bundleProductOptions == null) {
             return $result;
         }

app/code/Magento/Bundle/Model/Product/LinksList.php

@@ -63,7 +63,7 @@ public function getItems(\Magento\Catalog\Api\Data\ProductInterface $product, $o
             $productLink->setIsDefault($selection->getIsDefault())
                 ->setId($selection->getSelectionId())
                 ->setQty($selection->getSelectionQty())
-                ->setIsDefined($selection->getSelectionCanChangeQty())
+                ->setCanChangeQuantity($selection->getSelectionCanChangeQty())
                 ->setPrice($selectionPrice)
                 ->setPriceType($selectionPriceType);
             $productLinks[] = $productLink;

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

@@ -193,7 +193,7 @@ public function testGetChildren()
             ->willReturnSelf();
         $this->link->expects($this->once())->method('setIsDefault')->willReturnSelf();
         $this->link->expects($this->once())->method('setQty')->willReturnSelf();
-        $this->link->expects($this->once())->method('setIsDefined')->willReturnSelf();
+        $this->link->expects($this->once())->method('setCanChangeQuantity')->willReturnSelf();
         $this->link->expects($this->once())->method('setPrice')->willReturnSelf();
         $this->link->expects($this->once())->method('setPriceType')->willReturnSelf();
         $this->link->expects($this->once())->method('setId')->willReturnSelf();

dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductLinkManagementTest.php

@@ -33,12 +33,12 @@ public function testGetChildren()
         $this->assertArrayHasKey(0, $result);
         $this->assertArrayHasKey('option_id', $result[0]);
         $this->assertArrayHasKey('is_default', $result[0]);
-        $this->assertArrayHasKey('is_defined', $result[0]);
+        $this->assertArrayHasKey('can_change_quantity', $result[0]);
         $this->assertArrayHasKey('price', $result[0]);
         $this->assertArrayHasKey('price_type', $result[0]);
         $this->assertNotNull($result[0]['id']);
 
-        unset($result[0]['option_id'], $result[0]['is_default'], $result[0]['is_defined']);
+        unset($result[0]['option_id'], $result[0]['is_default'], $result[0]['can_change_quantity']);
         unset($result[0]['price'], $result[0]['price_type'], $result[0]['id']);
 
         ksort($result[0]);