MAGETWO-35264: Unable to request Soap service without plugging in CustomAttributeMap config

- Added unit test
- Removed redundant di config
- Updated api name

Author: anupdugar

app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php

@@ -73,7 +73,7 @@ public function getType($attributeCode, $serviceClass)
     /**
      * {@inheritdoc}
      */
-    public function getAllServiceDataInterface()
+    public function getAllServiceDataInterfaces()
     {
         $dataInterfaceArray = [];
         if (!$this->serviceBackendModelDataInterfaceMap) {

app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php

@@ -147,4 +147,25 @@ public function getTypeDataProvider()
             ]
         ];
     }
+
+    public function testGetAllServiceDataInterfaceEmpty()
+    {
+        $this->eavCustomAttributeTypeLocator = new EavCustomAttributeTypeLocator($this->attributeRepository);
+        $this->assertEmpty($this->eavCustomAttributeTypeLocator->getAllServiceDataInterfaces());
+    }
+
+    public function testGetAllServiceDataInterface()
+    {
+        $serviceBackendModelDataInterfaceMapData = [
+            'ServiceA' => ['BackedA' => 'ServiceDataInterfaceA'],
+            'ServiceB' => ['BackedB' => 'ServiceDataInterfaceB'],
+            'ServiceC' => ['BackedC' => 'ServiceDataInterfaceC']
+        ];
+        $this->eavCustomAttributeTypeLocator = new EavCustomAttributeTypeLocator(
+            $this->attributeRepository, [], $serviceBackendModelDataInterfaceMapData);
+        $this->assertEquals(
+            ['ServiceDataInterfaceA', 'ServiceDataInterfaceB', 'ServiceDataInterfaceC'],
+            $this->eavCustomAttributeTypeLocator->getAllServiceDataInterfaces()
+        );
+    }
 }

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

@@ -178,7 +178,7 @@ protected function _generate($requestedServices, $endPointUrl)
      */
     protected function addCustomAttributeTypes($wsdl)
     {
-        foreach ($this->customAttributeTypeLocator->getAllServiceDataInterface() as $customAttributeClass) {
+        foreach ($this->customAttributeTypeLocator->getAllServiceDataInterfaces() as $customAttributeClass) {
             $typeName = $this->_typeProcessor->register($customAttributeClass);
             $wsdl->addComplexType($typeName);
         }

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

@@ -27,7 +27,6 @@
             <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Webapi</argument>
         </arguments>
     </type>
-    <type name="Magento\Webapi\Model\Soap\Wsdl\Generator" />
     <type name="Magento\Integration\Model\ConfigBasedIntegrationManager">
         <plugin name="webapiSetup" type="Magento\Webapi\Model\Plugin\Manager" />
     </type>

lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php

@@ -23,7 +23,7 @@ public function getType($attributeCode, $serviceClass);
     /**
      * Get list of all Data Interface corresponding to complex custom attribute types
      *
-     * @return array
+     * @return string[] array of Data Interface class names
      */
-    public function getAllServiceDataInterface();
+    public function getAllServiceDataInterfaces();
 }