MAGETWO-66588: [Backport] Perfomance toolkit generator improvement for 2.1

Author: duhon

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

@@ -8,6 +8,7 @@
 
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Eav\Api\Data\AttributeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -49,11 +50,6 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
      */
     protected $searchCriteriaBuilder;
 
-    /**
-     * @var \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
-     */
-    private $optionManagement;
-
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Attribute $attributeResource
      * @param \Magento\Catalog\Helper\Product $productHelper
@@ -117,12 +113,17 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
                 throw NoSuchEntityException::singleField('attribute_code', $existingModel->getAttributeCode());
             }
 
+            // Attribute code must not be changed after attribute creation
+            $attribute->setAttributeCode($existingModel->getAttributeCode());
             $attribute->setAttributeId($existingModel->getAttributeId());
             $attribute->setIsUserDefined($existingModel->getIsUserDefined());
             $attribute->setFrontendInput($existingModel->getFrontendInput());
 
             if (is_array($attribute->getFrontendLabels())) {
-                $frontendLabel[0] = $existingModel->getDefaultFrontendLabel();
+                $defaultFrontendLabel = $attribute->getDefaultFrontendLabel();
+                $frontendLabel[0] = !empty($defaultFrontendLabel)
+                    ? $defaultFrontendLabel
+                    : $existingModel->getDefaultFrontendLabel();
                 foreach ($attribute->getFrontendLabels() as $item) {
                     $frontendLabel[$item->getStoreId()] = $item->getLabel();
                 }
@@ -171,10 +172,31 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
             );
             $attribute->setIsUserDefined(1);
         }
-        $this->attributeResource->save($attribute);
-        foreach ($attribute->getOptions() as $option) {
-            $this->getOptionManagement()->add($attribute->getAttributeCode(), $option);
+        if (!empty($attribute->getData(AttributeInterface::OPTIONS))) {
+            $options = [];
+            $sortOrder = 0;
+            $default = [];
+            $optionIndex = 0;
+            foreach ($attribute->getOptions() as $option) {
+                $optionIndex++;
+                $optionId = $option->getValue() ?: 'option_' . $optionIndex;
+                $options['value'][$optionId][0] = $option->getLabel();
+                $options['order'][$optionId] = $option->getSortOrder() ?: $sortOrder++;
+                if (is_array($option->getStoreLabels())) {
+                    foreach ($option->getStoreLabels() as $label) {
+                        $options['value'][$optionId][$label->getStoreId()] = $label->getLabel();
+                    }
+                }
+                if ($option->getIsDefault()) {
+                    $default[] = $optionId;
+                }
+            }
+            $attribute->setDefault($default);
+            if (count($options)) {
+                $attribute->setOption($options);
+            }
         }
+        $this->attributeResource->save($attribute);
         return $this->get($attribute->getAttributeCode());
     }
 
@@ -253,16 +275,4 @@ protected function validateFrontendInput($frontendInput)
             throw InputException::invalidFieldValue('frontend_input', $frontendInput);
         }
     }
-
-    /**
-     * @return \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
-     */
-    private function getOptionManagement()
-    {
-        if (null === $this->optionManagement) {
-            $this->optionManagement = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get('Magento\Catalog\Api\ProductAttributeOptionManagementInterface');
-        }
-        return $this->optionManagement;
-    }
 }