Merge pull request magento#1114 from magento-engcom/MSI-1105

Move Api\AppendReservationsInterface and Api\ReservationBuilderInterface to Model namespace
VitaliyBoyko · May 12, 2018 · 045d9a5 · 045d9a5
2 parents b5bc20b + eb10f0c
commit 045d9a5
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 43 deletions.
diff --git a/app/code/Magento/InventoryReservations/Model/AppendReservations.php b/app/code/Magento/InventoryReservations/Model/AppendReservations.php
@@ -10,8 +10,8 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
 use Magento\InventoryReservations\Model\ResourceModel\SaveMultiple;
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
 use Psr\Log\LoggerInterface;
 
 /**

diff --git a/app/code/Magento/InventoryReservations/Model/Reservation.php b/app/code/Magento/InventoryReservations/Model/Reservation.php
@@ -7,7 +7,7 @@
 
 namespace Magento\InventoryReservations\Model;
 
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
 
 /**
  * {@inheritdoc}

diff --git a/app/code/Magento/InventoryReservations/Model/ReservationBuilder.php b/app/code/Magento/InventoryReservations/Model/ReservationBuilder.php
@@ -11,8 +11,8 @@
 use Magento\Framework\Validation\ValidationException;
 use Magento\Framework\Validation\ValidationResult;
 use Magento\Framework\Validation\ValidationResultFactory;
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 
 /**
  * @inheritdoc

diff --git a/app/code/Magento/InventoryReservations/Model/ResourceModel/CleanupReservations.php b/app/code/Magento/InventoryReservations/Model/ResourceModel/CleanupReservations.php
@@ -8,7 +8,7 @@
 namespace Magento\InventoryReservations\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
 use Magento\InventoryReservationsApi\Model\CleanupReservationsInterface;
 
 /**

diff --git a/app/code/Magento/InventoryReservations/Model/ResourceModel/GetReservationsQuantity.php b/app/code/Magento/InventoryReservations/Model/ResourceModel/GetReservationsQuantity.php
@@ -8,7 +8,7 @@
 namespace Magento\InventoryReservations\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
 use Magento\InventoryReservationsApi\Model\GetReservationsQuantityInterface;
 
 /**

diff --git a/app/code/Magento/InventoryReservations/Model/ResourceModel/SaveMultiple.php b/app/code/Magento/InventoryReservations/Model/ResourceModel/SaveMultiple.php
@@ -8,7 +8,7 @@
 namespace Magento\InventoryReservations\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
 
 /**
  * Implementation of Reservation save multiple operation for specific db layer

diff --git a/app/code/Magento/InventoryReservations/Test/Unit/Model/ReservationBuilderTest.php b/app/code/Magento/InventoryReservations/Test/Unit/Model/ReservationBuilderTest.php
@@ -13,7 +13,7 @@
 use Magento\InventoryReservations\Model\ReservationBuilder;
 use Magento\InventoryReservations\Model\SnakeToCamelCaseConverter;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
 use PHPUnit\Framework\TestCase;
 
 class ReservationBuilderTest extends TestCase

diff --git a/app/code/Magento/InventoryReservations/etc/di.xml b/app/code/Magento/InventoryReservations/etc/di.xml
@@ -6,9 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\InventoryReservationsApi\Api\AppendReservationsInterface" type="Magento\InventoryReservations\Model\AppendReservations"/>
-    <preference for="Magento\InventoryReservationsApi\Api\Data\ReservationInterface" type="Magento\InventoryReservations\Model\Reservation"/>
-    <preference for="Magento\InventoryReservationsApi\Api\ReservationBuilderInterface" type="Magento\InventoryReservations\Model\ReservationBuilder"/>
+    <preference for="Magento\InventoryReservationsApi\Model\AppendReservationsInterface" type="Magento\InventoryReservations\Model\AppendReservations"/>
+    <preference for="Magento\InventoryReservationsApi\Model\ReservationInterface" type="Magento\InventoryReservations\Model\Reservation"/>
+    <preference for="Magento\InventoryReservationsApi\Model\ReservationBuilderInterface" type="Magento\InventoryReservations\Model\ReservationBuilder"/>
     <preference for="Magento\InventoryReservationsApi\Model\CleanupReservationsInterface" type="Magento\InventoryReservations\Model\ResourceModel\CleanupReservations"/>
     <preference for="Magento\InventoryReservationsApi\Model\GetReservationsQuantityInterface" type="Magento\InventoryReservations\Model\ResourceModel\GetReservationsQuantity"/>
     <type name="Magento\InventoryReservations\Model\ResourceModel\CleanupReservations">

diff --git a/...nsApi/Api/AppendReservationsInterface.php → ...Api/Model/AppendReservationsInterface.php b/...nsApi/Api/AppendReservationsInterface.php → ...Api/Model/AppendReservationsInterface.php
@@ -5,9 +5,9 @@
  */
 declare(strict_types=1);
 
-namespace Magento\InventoryReservationsApi\Api;
+namespace Magento\InventoryReservationsApi\Model;
 
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
 
 /**
  * Domain service used to append Reservations to keep track of quantity deductions before the related SourceItems

diff --git a/...nsApi/Api/ReservationBuilderInterface.php → ...Api/Model/ReservationBuilderInterface.php b/...nsApi/Api/ReservationBuilderInterface.php → ...Api/Model/ReservationBuilderInterface.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\InventoryReservationsApi\Api;
+namespace Magento\InventoryReservationsApi\Model;
 
 use Magento\Framework\Validation\ValidationException;
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
 
 /**
  * Used to build ReservationInterface objects

diff --git a/...ionsApi/Api/Data/ReservationInterface.php → ...vationsApi/Model/ReservationInterface.php b/...ionsApi/Api/Data/ReservationInterface.php → ...vationsApi/Model/ReservationInterface.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\InventoryReservationsApi\Api\Data;
+namespace Magento\InventoryReservationsApi\Model;
 
 /**
  * The entity responsible for reservations, created to keep inventory amount (product quantity) up-to-date.

diff --git a/app/code/Magento/InventorySales/Model/PlaceReservationsForSalesEvent.php b/app/code/Magento/InventorySales/Model/PlaceReservationsForSalesEvent.php
@@ -7,8 +7,8 @@
 
 namespace Magento\InventorySales\Model;
 
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\InventorySalesApi\Api\Data\ItemToSellInterface;
 use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
 use Magento\InventorySalesApi\Api\Data\SalesEventInterface;

diff --git a/...gento/InventorySales/Plugin/CatalogInventory/StockManagement/ProcessBackItemQtyPlugin.php b/...gento/InventorySales/Plugin/CatalogInventory/StockManagement/ProcessBackItemQtyPlugin.php
@@ -12,8 +12,8 @@
 use Magento\InventoryCatalogApi\Model\GetProductTypesBySkusInterface;
 use Magento\InventoryCatalogApi\Model\GetSkusByProductIdsInterface;
 use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\InventorySalesApi\Model\StockByWebsiteIdResolverInterface;
 
 /**

diff --git a/...nventorySales/Plugin/CatalogInventory/StockManagement/ProcessRevertProductsSalePlugin.php b/...nventorySales/Plugin/CatalogInventory/StockManagement/ProcessRevertProductsSalePlugin.php
@@ -13,8 +13,8 @@
 use Magento\InventoryCatalogApi\Model\GetProductTypesBySkusInterface;
 use Magento\InventoryCatalogApi\Model\GetSkusByProductIdsInterface;
 use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\InventorySalesApi\Model\StockByWebsiteIdResolverInterface;
 
 /**

diff --git a/...Plugin/InventoryReservationsApi/PreventAppendReservationOnNotManageItemsInStockPlugin.php b/...Plugin/InventoryReservationsApi/PreventAppendReservationOnNotManageItemsInStockPlugin.php
@@ -10,8 +10,8 @@
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\InventoryConfigurationApi\Api\GetStockItemConfigurationInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
 
 /**
  * Prevent append reservation if use_config_manage_stock is set to 0

diff --git a/...ventorySales/Test/Integration/IsProductSalable/IsSalableWithReservationsConditionTest.php b/...ventorySales/Test/Integration/IsProductSalable/IsSalableWithReservationsConditionTest.php
@@ -14,8 +14,8 @@
 use Magento\InventoryApi\Api\SourceItemRepositoryInterface;
 use Magento\InventoryApi\Api\SourceItemsSaveInterface;
 use Magento\InventoryReservationsApi\Model\CleanupReservationsInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\InventorySalesApi\Api\IsProductSalableInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;

diff --git a/...st/Integration/IsProductSalableForRequestedQty/IsSalableWithReservationsConditionTest.php b/...st/Integration/IsProductSalableForRequestedQty/IsSalableWithReservationsConditionTest.php
@@ -11,8 +11,8 @@
 use Magento\InventoryConfigurationApi\Api\GetStockItemConfigurationInterface;
 use Magento\InventoryConfigurationApi\Api\SaveStockItemConfigurationInterface;
 use Magento\InventoryReservationsApi\Model\CleanupReservationsInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\InventorySalesApi\Api\IsProductSalableForRequestedQtyInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;

diff --git a/app/code/Magento/InventorySales/Test/Integration/Stock/GetProductSalableQtyTest.php b/app/code/Magento/InventorySales/Test/Integration/Stock/GetProductSalableQtyTest.php
@@ -8,8 +8,8 @@
 namespace Magento\InventorySales\Test\Integration\Stock;
 
 use Magento\InventoryReservationsApi\Model\CleanupReservationsInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\InventorySalesApi\Api\GetProductSalableQtyInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;

diff --git a/...ventorySales/Test/Integration/StockManagement/ReservationPlacingDuringBackItemQtyTest.php b/...ventorySales/Test/Integration/StockManagement/ReservationPlacingDuringBackItemQtyTest.php
@@ -11,8 +11,8 @@
 use Magento\CatalogInventory\Model\StockManagement;
 use Magento\InventoryApi\Api\StockRepositoryInterface;
 use Magento\InventoryReservationsApi\Model\CleanupReservationsInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\InventorySalesApi\Api\GetProductSalableQtyInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;

diff --git a/...les/Test/Integration/StockManagement/ReservationPlacingDuringRegisterProductsSaleTest.php b/...les/Test/Integration/StockManagement/ReservationPlacingDuringRegisterProductsSaleTest.php
@@ -14,9 +14,9 @@
 use Magento\Framework\Registry;
 use Magento\InventoryReservationsApi\Model\CleanupReservationsInterface;
 use Magento\InventoryReservationsApi\Model\GetReservationsQuantityInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\Data\ReservationInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\InventorySalesApi\Api\Data\SalesEventInterface;
 use Magento\InventorySalesApi\Api\GetProductSalableQtyInterface;
 use Magento\Quote\Api\CartManagementInterface;

diff --git a/...Sales/Test/Integration/StockManagement/ReservationPlacingDuringRevertProductsSaleTest.php b/...Sales/Test/Integration/StockManagement/ReservationPlacingDuringRevertProductsSaleTest.php
@@ -11,8 +11,8 @@
 use Magento\CatalogInventory\Model\StockManagement;
 use Magento\InventoryApi\Api\StockRepositoryInterface;
 use Magento\InventoryReservationsApi\Model\CleanupReservationsInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\InventorySalesApi\Api\GetProductSalableQtyInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;

diff --git a/...ales/Test/Integration/StockManagement/ReservationPlacingOnCanSubtractQtySetToZeroTest.php b/...ales/Test/Integration/StockManagement/ReservationPlacingOnCanSubtractQtySetToZeroTest.php
@@ -9,8 +9,8 @@
 
 use Magento\InventoryReservationsApi\Model\CleanupReservationsInterface;
 use Magento\InventoryReservationsApi\Model\GetReservationsQuantityInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 

diff --git a/...est/Integration/StockManagement/ReservationPlacingOnUseConfigManageStockSetToZeroTest.php b/...est/Integration/StockManagement/ReservationPlacingOnUseConfigManageStockSetToZeroTest.php
@@ -9,8 +9,8 @@
 
 use Magento\InventoryReservationsApi\Model\CleanupReservationsInterface;
 use Magento\InventoryReservationsApi\Model\GetReservationsQuantityInterface;
-use Magento\InventoryReservationsApi\Api\AppendReservationsInterface;
-use Magento\InventoryReservationsApi\Api\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 

diff --git a/app/code/Magento/InventorySales/etc/di.xml b/app/code/Magento/InventorySales/etc/di.xml
@@ -24,7 +24,7 @@
         <plugin name="check_quote_item_qty" type="Magento\InventorySales\Plugin\StockState\CheckQuoteItemQtyPlugin"/>
         <plugin name="suggest_qty" type="Magento\InventorySales\Plugin\StockState\SuggestQtyPlugin"/>
     </type>
-    <type name="Magento\InventoryReservationsApi\Api\AppendReservationsInterface">
+    <type name="Magento\InventoryReservationsApi\Model\AppendReservationsInterface">
         <plugin name="prevent_append_reservation_on_not_manage_items_in_stock" type="Magento\InventorySales\Plugin\InventoryReservationsApi\PreventAppendReservationOnNotManageItemsInStockPlugin"/>
     </type>
     <!-- Sales Event -->