MAGETWO-31901: Implement Attributes Mapping to Data Interfaces

- Using Magento\Framework\Object VirtualType instance as a container for complex Custom Attribute Types

Author: anupdugar

app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php

@@ -61,14 +61,15 @@ class Generator
      * @param \Magento\Webapi\Model\Cache\Type $cache
      * @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Object $customAttributeMap
      */
     public function __construct(
         \Magento\Webapi\Model\Soap\Config $apiConfig,
         Factory $wsdlFactory,
         \Magento\Webapi\Model\Cache\Type $cache,
         \Magento\Framework\Reflection\TypeProcessor $typeProcessor,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Api\CustomAttributeMap $customAttributeMap
+        \Magento\Framework\Object $customAttributeMap
     ) {
         $this->_apiConfig = $apiConfig;
         $this->_wsdlFactory = $wsdlFactory;

app/code/Magento/Webapi/etc/di.xml

@@ -52,9 +52,9 @@
             <argument name="cache" xsi:type="object">Magento\Webapi\Model\Cache\Type</argument>
         </arguments>
     </type>
-    <type name="Magento\Webapi\Model\Soap\Config">
+    <type name="Magento\Webapi\Model\Soap\Wsdl\Generator">
         <arguments>
-            <argument name="customAttributeMap" xsi:type="object">Magento\Framework\Api\CustomAttributeMap</argument>
+            <argument name="customAttributeMap" xsi:type="object">CustomAttributeMap</argument>
         </arguments>
     </type>
 </config>

dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/di.xml

@@ -30,17 +30,12 @@
             <argument name="resource" xsi:type="object">Magento\TestModuleMSC\Model\Resource\Item</argument>
         </arguments>
     </type>
-    <type name="Magento\TestModuleMSC\Model\Data\CustomAttributeNestedDataObject">
-        <arguments>
-            <argument name="resource" xsi:type="object">Magento\TestModuleMSC\Model\Resource\Item</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Api\CustomAttributeMap">
+    <virtualType name="CustomAttributeMap" type="Magento\Framework\Object">
         <arguments>
             <argument name="data" xsi:type="array">
                 <item name="customAttributeDataObjectInterface" xsi:type="string">Magento\TestModuleMSC\Api\Data\CustomAttributeDataObjectInterface</item>
                 <item name="customAttributeNestedDataObjectInterface" xsi:type="string">Magento\TestModuleMSC\Api\Data\CustomAttributeNestedDataObjectInterface</item>
             </argument>
         </arguments>
-    </type>
+    </virtualType>
 </config>