MAGETWO-64224: Remove usages of AttributeCache from customer module

- refactoring to do not use methods that are not part of interface

Author: Igor Melnikov

app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php

@@ -44,9 +44,9 @@ class AttributeMetadataCache
     private $isAttributeCacheEnabled;
 
     /**
-     * @var AttributeMetadataFactory
+     * @var AttributeMetadataHydrator
      */
-    private $attributeMetadataFactory;
+    private $attributeMetadataHydrator;
 
     /**
      * @var SerializerInterface
@@ -58,19 +58,19 @@ class AttributeMetadataCache
      *
      * @param CacheInterface $cache
      * @param StateInterface $state
-     * @param AttributeMetadataFactory $attributeMetadataFactory
      * @param SerializerInterface $serializer
+     * @param AttributeMetadataHydrator $attributeMetadataHydrator
      */
     public function __construct(
         CacheInterface $cache,
         StateInterface $state,
-        AttributeMetadataFactory $attributeMetadataFactory,
-        SerializerInterface $serializer
+        SerializerInterface $serializer,
+        AttributeMetadataHydrator $attributeMetadataHydrator
     ) {
         $this->cache = $cache;
         $this->state = $state;
-        $this->attributeMetadataFactory = $attributeMetadataFactory;
         $this->serializer = $serializer;
+        $this->attributeMetadataHydrator = $attributeMetadataHydrator;
     }
 
     /**
@@ -92,7 +92,7 @@ public function load($entityType, $suffix = '')
                 $attributesData = $this->serializer->unserialize($serializedData);
                 $attributes = [];
                 foreach ($attributesData as $key => $attributeData) {
-                    $attributes[$key] = $this->attributeMetadataFactory->create($attributeData);
+                    $attributes[$key] = $this->attributeMetadataHydrator->hydrate($attributeData);
                 }
                 $this->attributes[$entityType . $suffix] = $attributes;
                 return $attributes;
@@ -109,14 +109,14 @@ public function load($entityType, $suffix = '')
      * @param string $suffix
      * @return void
      */
-    public function save($entityType, $attributes, $suffix = '')
+    public function save($entityType, array $attributes, $suffix = '')
     {
         $this->attributes[$entityType . $suffix] = $attributes;
         if ($this->isEnabled()) {
             $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
             $attributesData = [];
             foreach ($attributes as $key => $attribute) {
-                $attributesData[$key] = $attribute->__toArray();
+                $attributesData[$key] = $this->attributeMetadataHydrator->extract($attribute);
             }
             $serializedData = $this->serializer->serialize($attributesData);
             $this->cache->save(

app/code/Magento/Customer/Model/Metadata/AttributeMetadataFactory.php renamed to app/code/Magento/Customer/Model/Metadata/AttributeMetadataHydrator.php

@@ -10,11 +10,12 @@
 use Magento\Customer\Api\Data\OptionInterface;
 use Magento\Customer\Api\Data\OptionInterfaceFactory;
 use Magento\Customer\Api\Data\ValidationRuleInterfaceFactory;
+use Magento\Framework\Reflection\DataObjectProcessor;
 
 /**
- * Factory for AttributeMetadataInterface
+ * Hydrator for AttributeMetadataInterface
  */
-class AttributeMetadataFactory
+class AttributeMetadataHydrator
 {
     /**
      * @var AttributeMetadataInterfaceFactory
@@ -31,30 +32,38 @@ class AttributeMetadataFactory
      */
     private $validationRuleFactory;
 
+    /**
+     * @var DataObjectProcessor
+     */
+    private $dataObjectProcessor;
+
     /**
      * Constructor
      *
      * @param AttributeMetadataInterfaceFactory $attributeMetadataFactory
      * @param OptionInterfaceFactory $optionFactory
      * @param ValidationRuleInterfaceFactory $validationRuleFactory
+     * @param DataObjectProcessor $dataObjectProcessor
      */
     public function __construct(
         AttributeMetadataInterfaceFactory $attributeMetadataFactory,
         OptionInterfaceFactory $optionFactory,
-        ValidationRuleInterfaceFactory $validationRuleFactory
+        ValidationRuleInterfaceFactory $validationRuleFactory,
+        DataObjectProcessor $dataObjectProcessor
     ) {
         $this->attributeMetadataFactory = $attributeMetadataFactory;
         $this->optionFactory = $optionFactory;
         $this->validationRuleFactory = $validationRuleFactory;
+        $this->dataObjectProcessor = $dataObjectProcessor;
     }
 
     /**
-     * Create and populate with data AttributeMetadataInterface
+     * Convert array to AttributeMetadataInterface
      *
      * @param array $data
      * @return AttributeMetadataInterface
      */
-    public function create($data)
+    public function hydrate(array $data)
     {
         if (isset($data[AttributeMetadataInterface::OPTIONS])) {
             $data[AttributeMetadataInterface::OPTIONS] = $this->createOptions(
@@ -72,12 +81,12 @@ public function create($data)
     }
 
     /**
-     * Create and populate with data OptionInterface
+     * Convert AttributeMetadataInterface to array
      *
      * @param array $data
      * @return OptionInterface[]
      */
-    private function createOptions($data)
+    private function createOptions(array $data)
     {
         foreach ($data as $key => $optionData) {
             if (isset($optionData[OptionInterface::OPTIONS])) {
@@ -87,4 +96,16 @@ private function createOptions($data)
         }
         return $data;
     }
+
+    /**
+     * @param $attributeMetadata
+     * @return array
+     */
+    public function extract($attributeMetadata)
+    {
+        return $this->dataObjectProcessor->buildOutputDataArray(
+            $attributeMetadata,
+            AttributeMetadataInterface::class
+        );
+    }
 }