MAGETWO-33101: Refactor code that uses customer builders in Customer module

    - Refactored usage of Magento\Customer\Model\AttributeMetadataDataBuilder

Author: Yu Tang

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Addresses.php

@@ -7,7 +7,6 @@
 
 use Magento\Customer\Controller\RegistryConstants;
 use Magento\Customer\Api\AddressMetadataInterface;
-use Magento\Customer\Model\AttributeMetadataDataBuilder;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
@@ -67,9 +66,6 @@ class Addresses extends GenericMetadata
     /** @var CustomerInterfaceFactory */
     protected $customerDataFactory;
 
-    /** @var  AttributeMetadataDataBuilder */
-    protected $_attributeMetadataBuilder;
-
     /**
      * @var AddressMapper
      */
@@ -96,7 +92,6 @@ class Addresses extends GenericMetadata
      * @param AddressMetadataInterface $addressMetadataService
      * @param AddressInterfaceFactory $addressDataFactory
      * @param CustomerInterfaceFactory $customerInterfaceFactory
-     * @param AttributeMetadataDataBuilder $attributeMetadataBuilder
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param AddressMapper $addressMapper
      * @param CustomerMapper $customerMapper
@@ -121,7 +116,6 @@ public function __construct(
         AddressMetadataInterface $addressMetadataService,
         AddressInterfaceFactory $addressDataFactory,
         CustomerInterfaceFactory $customerInterfaceFactory,
-        AttributeMetadataDataBuilder $attributeMetadataBuilder,
         \Magento\Directory\Helper\Data $directoryHelper,
         AddressMapper $addressMapper,
         DataObjectHelper $dataObjectHelper,
@@ -138,7 +132,6 @@ public function __construct(
         $this->_addressMetadataService = $addressMetadataService;
         $this->addressDataFactory = $addressDataFactory;
         $this->customerDataFactory = $customerInterfaceFactory;
-        $this->_attributeMetadataBuilder = $attributeMetadataBuilder;
         $this->_directoryHelper = $directoryHelper;
         $this->addressMapper = $addressMapper;
         $this->dataObjectHelper = $dataObjectHelper;
@@ -261,21 +254,12 @@ public function initForm()
         $attributes = $addressForm->getAttributes();
         if (isset($attributes['street'])) {
             if ($attributes['street']->getMultilineCount() <= 0) {
-                $attributes['street'] = $this->_attributeMetadataBuilder->populate(
-                    $attributes['street']
-                )->setMultilineCount(
-                    self::DEFAULT_STREET_LINES_COUNT
-                )->create();
+                $attributes['street']->setMultilineCount(self::DEFAULT_STREET_LINES_COUNT);
             }
         }
         foreach ($attributes as $key => $attribute) {
-            $attributes[$key] = $this->_attributeMetadataBuilder->populate(
-                $attribute
-            )->setFrontendLabel(
-                __($attribute->getFrontendLabel())
-            )->setVisible(
-                false
-            )->create();
+            $attributes[$key]->setFrontendLabel(__($attribute->getFrontendLabel()))
+                ->setIsVisible(false);
         }
         $this->_setFieldset($attributes, $fieldset);
 

app/code/Magento/Customer/Model/AttributeMetadataConverter.php

@@ -7,6 +7,7 @@
 
 use Magento\Customer\Api\Data\OptionInterfaceFactory;
 use Magento\Customer\Api\Data\ValidationRuleInterfaceFactory;
+use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
 
 /**
  * Converter for AttributeMetadata
@@ -24,9 +25,9 @@ class AttributeMetadataConverter
     private $validationRuleFactory;
 
     /**
-     * @var AttributeMetadataDataBuilder
+     * @var AttributeMetadataInterfaceFactory
      */
-    private $_attributeMetadataBuilder;
+    private $attributeMetadataFactory;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
@@ -37,18 +38,18 @@ class AttributeMetadataConverter
      *
      * @param OptionInterfaceFactory $optionFactory
      * @param ValidationRuleInterfaceFactory $validationRuleFactory
-     * @param AttributeMetadataDataBuilder $attributeMetadataBuilder
+     * @param AttributeMetadataInterfaceFactory $attributeMetadataFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      */
     public function __construct(
         OptionInterfaceFactory $optionFactory,
         ValidationRuleInterfaceFactory $validationRuleFactory,
-        AttributeMetadataDataBuilder $attributeMetadataBuilder,
+        AttributeMetadataInterfaceFactory $attributeMetadataFactory,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
     ) {
         $this->optionFactory = $optionFactory;
         $this->validationRuleFactory = $validationRuleFactory;
-        $this->_attributeMetadataBuilder = $attributeMetadataBuilder;
+        $this->attributeMetadataFactory = $attributeMetadataFactory;
         $this->dataObjectHelper = $dataObjectHelper;
     }
 
@@ -87,24 +88,23 @@ public function createMetadataAttribute($attribute)
             $validationRules[] = $validationRule;
         }
 
-        $this->_attributeMetadataBuilder->setAttributeCode($attribute->getAttributeCode())
+
+        return $this->attributeMetadataFactory->create()->setAttributeCode($attribute->getAttributeCode())
             ->setFrontendInput($attribute->getFrontendInput())
             ->setInputFilter((string)$attribute->getInputFilter())
             ->setStoreLabel($attribute->getStoreLabel())
             ->setValidationRules($validationRules)
-            ->setVisible((boolean)$attribute->getIsVisible())
-            ->setRequired((boolean)$attribute->getIsRequired())
+            ->setIsVisible((boolean)$attribute->getIsVisible())
+            ->setIsRequired((boolean)$attribute->getIsRequired())
             ->setMultilineCount((int)$attribute->getMultilineCount())
             ->setDataModel((string)$attribute->getDataModel())
             ->setOptions($options)
             ->setFrontendClass($attribute->getFrontend()->getClass())
             ->setFrontendLabel($attribute->getFrontendLabel())
             ->setNote((string)$attribute->getNote())
-            ->setSystem((boolean)$attribute->getIsSystem())
-            ->setUserDefined((boolean)$attribute->getIsUserDefined())
+            ->setIsSystem((boolean)$attribute->getIsSystem())
+            ->setIsUserDefined((boolean)$attribute->getIsUserDefined())
             ->setBackendType($attribute->getBackendType())
             ->setSortOrder((int)$attribute->getSortOrder());
-
-        return $this->_attributeMetadataBuilder->create();
     }
 }