MAGETWO-38285: [Add join processors to search service] Catalog Module

 - make Product\Option extensible

Author: Cari Spruiell

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

@@ -9,7 +9,7 @@
 /**
  * @api
  */
-interface ProductCustomOptionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
+interface ProductCustomOptionInterface
 {
     /**
      * Get product SKU

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

@@ -1970,7 +1970,7 @@ public function getOptions()
     {
         if (empty($this->_options) && $this->getHasOptions() && !$this->optionsInitialized) {
             $collection = $this->getProductOptionsCollection();
-            $this->joinProcessor->process($collection, 'Magento\Catalog\Api\Data\ProductCustomOptionInterface');
+            $this->joinProcessor->process($collection);
             foreach ($collection as $option) {
                 $option->setProduct($this);
                 $this->addOption($option);

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

@@ -12,7 +12,6 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Resource\Product\Option\Value\Collection;
 use Magento\Catalog\Pricing\Price\BasePrice;
-use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Exception\LocalizedException;
 
 /**
@@ -26,7 +25,8 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  */
-class Option extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCustomOptionInterface
+class Option extends \Magento\Framework\Model\AbstractExtensibleModel
+    implements \Magento\Catalog\Api\Data\ProductCustomOptionInterface
 {
     const OPTION_GROUP_TEXT = 'text';
 
@@ -116,6 +116,8 @@ class Option extends AbstractModel implements \Magento\Catalog\Api\Data\ProductC
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
+     * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
      * @param Option\Value $productOptionValue
      * @param Option\Type\Factory $optionFactory
      * @param \Magento\Framework\Stdlib\String $string
@@ -128,6 +130,8 @@ class Option extends AbstractModel implements \Magento\Catalog\Api\Data\ProductC
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
+        \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory,
+        \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory,
         Option\Value $productOptionValue,
         \Magento\Catalog\Model\Product\Option\Type\Factory $optionFactory,
         \Magento\Framework\Stdlib\String $string,
@@ -143,6 +147,8 @@ public function __construct(
         parent::__construct(
             $context,
             $registry,
+            $extensionFactory,
+            $customAttributeFactory,
             $resource,
             $resourceCollection,
             $data
@@ -406,7 +412,7 @@ public function saveOptions()
     }
 
     /**
-     * @return AbstractModel
+     * @return \Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function afterSave()

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php

@@ -419,4 +419,15 @@ public function testValidate()
             $this->assertTrue($error);
         }
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoAppIsolation enabled
+     */
+    public function testGetOptions()
+    {
+        $this->_model->load(1);
+        $options = $this->_model->getOptions();
+        $this->assertEquals(4, count($options));
+    }
 }