MAGETWO-83872: Write metadata service

Author: Eric Bohanon

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

@@ -672,7 +672,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Eav\Model\TypeLocator\ServiceTypeToEntityTypeMap">
+    <type name="Magento\Framework\Webapi\ServiceTypeToEntityTypeMap">
         <arguments>
             <argument name="serviceTypeToEntityTypeMap" xsi:type="array">
                 <item name="Magento\Catalog\Api\Data\ProductInterface" xsi:type="const">Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE</item>

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

@@ -145,7 +145,7 @@
     </type>
     <preference for="Magento\Customer\CustomerData\JsLayoutDataProviderPoolInterface"
                 type="Magento\Customer\CustomerData\JsLayoutDataProviderPool"/>
-    <type name="Magento\Eav\Model\TypeLocator\ServiceTypeToEntityTypeMap">
+    <type name="Magento\Framework\Webapi\ServiceTypeToEntityTypeMap">
         <arguments>
             <argument name="serviceTypeToEntityTypeMap" xsi:type="array">
                 <item name="Magento\Customer\Api\Data\CustomerInterface" xsi:type="const">Magento\Customer\Api\CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER</item>

app/code/Magento/Eav/Model/TypeLocator/ServiceClassLocator.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Reflection\TypeProcessor;
 use Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface;
+use Magento\Framework\Webapi\ServiceTypeToEntityTypeMap;
 
 /**
  * Class to find type based off of ServiceTypeToEntityTypeMap. This locator is introduced for backwards compatibility.
@@ -60,8 +61,8 @@ public function __construct(
      */
     public function getType($attributeCode, $entityType)
     {
-        $map = $this->serviceTypeMap->getMap();
-        if (!isset($map[$entityType])) {
+        $entityCode = $this->serviceTypeMap->getEntityType($entityType);
+        if (!$entityType) {
             return TypeProcessor::NORMALIZED_ANY_TYPE;
         }
 

app/code/Magento/Eav/Model/TypeLocator/ServiceTypeToEntityTypeMap.php

@@ -46,7 +46,7 @@
     <type name="Magento\Eav\Model\ResourceModel\Entity\Attribute">
         <plugin name="storeLabelCaching" type="Magento\Eav\Plugin\Model\ResourceModel\Entity\Attribute" />
     </type>
-    <type name="Magento\Eav\Model\TypeLocator\ServiceTypeToEntityTypeMap">
+    <type name="Magento\Framework\Webapi\ServiceTypeToEntityTypeMap">
         <arguments>
             <argument name="serviceTypeToEntityTypeMap" xsi:type="array" />
         </arguments>

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

@@ -38,7 +38,7 @@
             </argument>
         </arguments>
     </virtualType>
-    <type name="Magento\Eav\Model\TypeLocator\ServiceTypeToEntityTypeMap">
+    <type name="Magento\Framework\Webapi\ServiceTypeToEntityTypeMap">
         <arguments>
             <argument name="serviceTypeToEntityTypeMap" xsi:type="array">
                 <item name="Magento\TestModuleMSC\Api\AllSoapAndRestInterface" xsi:type="string">1</item>

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

@@ -7,7 +7,7 @@
  */
 namespace Magento\Framework\Webapi;
 
-use Magento\Eav\Model\TypeLocator\ServiceTypeToEntityTypeMap;
+use Magento\Framework\Webapi\ServiceTypeToEntityTypeMap;
 use Magento\Framework\Api\AttributeValue;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\SimpleDataObjectConverter;
@@ -232,11 +232,11 @@ protected function convertCustomAttributeValue($customAttributesValueArray, $dat
 
             list($customAttributeCode, $customAttributeValue) = $this->processCustomAttribute($customAttribute);
 
-            $map = $this->serviceTypeToEntityTypeMap->getMap();
-            if (isset($map[$dataObjectClassName])) {
+            $entityType = $this->serviceTypeToEntityTypeMap->getEntityType($dataObjectClassName);
+            if ($entityType) {
                 $type = $this->customAttributeTypeLocator->getType(
                     $customAttributeCode,
-                    $map[$dataObjectClassName]
+                    $entityType
                 );
             } else {
                 $type = TypeProcessor::ANY_TYPE;

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

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Webapi;
+
+/**
+ * Maps configured entity types relative to their service data contract
+ */
+class ServiceTypeToEntityTypeMap
+{
+    /**
+     * @var string
+     */
+    private $serviceTypeToEntityTypeMap;
+
+    /**
+     * @param $serviceTypeToEntityTypeMap
+     */
+    public function __construct($serviceTypeToEntityTypeMap)
+    {
+        $this->serviceTypeToEntityTypeMap = $serviceTypeToEntityTypeMap;
+    }
+
+    /**
+     * Return entity type mapped to service type. Returns false if service type is not mapped.
+     *
+     * Example:
+     * [
+     *   'Magento\Catalog\Api\Data\ProductInterface' => 'catalog_product'
+     * ]
+     *
+     * @return string|boolean
+     */
+    public function getEntityType(string $serviceType)
+    {
+        if (isset($this->serviceTypeToEntityTypeMap[$serviceType])) {
+            return $this->serviceTypeToEntityTypeMap;
+        }
+
+        return false;
+    }
+}