MAGETWO-58386: Eliminate dependencies on modules from lib/Magento.

Author: valdislav

lib/internal/Magento/Framework/EntityManager/CustomAttributesMapper.php

@@ -18,20 +18,19 @@ class CustomAttributesMapper implements MapperInterface
     /**
      * CustomAttributesMapper constructor.
      *
-     * @param MapperInterface|null $mapper
+     * @param MapperInterface $mapper
      */
-    public function __construct(MapperInterface $mapper = null)
+    public function __construct(MapperInterface $mapper)
     {
         $this->mapper = $mapper;
     }
 
     /**
      * {@inheritdoc}
-     * @deprecated
      */
     public function entityToDatabase($entityType, $data)
     {
-        return $this->mapper !== null ? $this->mapper->entityToDatabase($entityType, $data) : $data;
+        return $this->mapper->entityToDatabase($entityType, $data);
     }
 
     /**
@@ -40,6 +39,6 @@ public function entityToDatabase($entityType, $data)
      */
     public function databaseToEntity($entityType, $data)
     {
-        return $this->mapper !== null ? $this->mapper->databaseToEntity($entityType, $data) : $data;
+        return $this->mapper->databaseToEntity($entityType, $data);
     }
 }