Refactoring. BuilderPartsResolverInterface -> ResolverInterface.

Author: oleksandrkravchuk

Diff for: InventoryInStorePickup/Model/SearchCriteria/ResolveArea.php

@@ -11,15 +11,15 @@
 use Magento\InventoryApi\Api\Data\SourceInterface;
 use Magento\InventoryInStorePickup\Model\SearchRequest\Area\GetDistanceToSources;
 use Magento\InventoryInStorePickupApi\Api\Data\SearchRequestInterface;
-use Magento\InventoryInStorePickupApi\Model\SearchCriteria\BuilderPartsResolverInterface;
+use Magento\InventoryInStorePickupApi\Model\SearchCriteria\ResolverInterface;
 use Magento\InventoryInStorePickupApi\Model\SearchCriteria\SearchCriteriaBuilderDecorator;
 
 /**
  * Calculate Distance Based Filter and resolve part for Search Criteria Builder.
  *
  * Apply filter by Source Codes, limited by distance and assignment to the Scope.
  */
-class ResolveArea implements BuilderPartsResolverInterface
+class ResolveArea implements ResolverInterface
 {
     /**
      * @var GetDistanceToSources

Diff for: InventoryInStorePickup/Model/SearchCriteria/ResolveDefaultFilters.php

@@ -10,13 +10,13 @@
 use Magento\InventoryApi\Api\Data\SourceInterface;
 use Magento\InventoryInStorePickupApi\Api\Data\PickupLocationInterface;
 use Magento\InventoryInStorePickupApi\Api\Data\SearchRequestInterface;
-use Magento\InventoryInStorePickupApi\Model\SearchCriteria\BuilderPartsResolverInterface;
+use Magento\InventoryInStorePickupApi\Model\SearchCriteria\ResolverInterface;
 use Magento\InventoryInStorePickupApi\Model\SearchCriteria\SearchCriteriaBuilderDecorator;
 
 /**
  * Add default filters to the Search Criteria Builder.
  */
-class ResolveDefaultFilters implements BuilderPartsResolverInterface
+class ResolveDefaultFilters implements ResolverInterface
 {
     /**
      * @inheritdoc

Diff for: InventoryInStorePickup/Model/SearchCriteria/ResolveFilters.php

@@ -11,13 +11,13 @@
 use Magento\InventoryInStorePickupApi\Api\Data\PickupLocationInterface;
 use Magento\InventoryInStorePickupApi\Api\Data\SearchRequest\FilterInterface;
 use Magento\InventoryInStorePickupApi\Api\Data\SearchRequestInterface;
-use Magento\InventoryInStorePickupApi\Model\SearchCriteria\BuilderPartsResolverInterface;
+use Magento\InventoryInStorePickupApi\Model\SearchCriteria\ResolverInterface;
 use Magento\InventoryInStorePickupApi\Model\SearchCriteria\SearchCriteriaBuilderDecorator;
 
 /**
  * Resolve Search Criteria Builder parts from the Filter Set.
  */
-class ResolveFilters implements BuilderPartsResolverInterface
+class ResolveFilters implements ResolverInterface
 {
     /**
      * @inheritdoc

Diff for: InventoryInStorePickup/Model/SearchCriteria/ResolveIntersection.php

@@ -10,13 +10,13 @@
 use Magento\InventoryApi\Api\Data\SourceInterface;
 use Magento\InventoryInStorePickup\Model\ResourceModel\GetPickupLocationIntersectionForSkus;
 use Magento\InventoryInStorePickupApi\Api\Data\SearchRequestInterface;
-use Magento\InventoryInStorePickupApi\Model\SearchCriteria\BuilderPartsResolverInterface;
+use Magento\InventoryInStorePickupApi\Model\SearchCriteria\ResolverInterface;
 use Magento\InventoryInStorePickupApi\Model\SearchCriteria\SearchCriteriaBuilderDecorator;
 
 /**
  * Find intersection of assignments of products between Pickup Locations and filter by codes.
  */
-class ResolveIntersection implements BuilderPartsResolverInterface
+class ResolveIntersection implements ResolverInterface
 {
     /**
      * @var GetPickupLocationIntersectionForSkus

Diff for: InventoryInStorePickup/Model/SearchCriteria/ResolveMeta.php

@@ -12,13 +12,13 @@
 use Magento\InventoryInStorePickupApi\Api\Data\PickupLocationInterface;
 use Magento\InventoryInStorePickupApi\Api\Data\SearchRequest\AreaInterface;
 use Magento\InventoryInStorePickupApi\Api\Data\SearchRequestInterface;
-use Magento\InventoryInStorePickupApi\Model\SearchCriteria\BuilderPartsResolverInterface;
+use Magento\InventoryInStorePickupApi\Model\SearchCriteria\ResolverInterface;
 use Magento\InventoryInStorePickupApi\Model\SearchCriteria\SearchCriteriaBuilderDecorator;
 
 /**
  * Resolve Page and Sort related information for the Search Criteria Builder.
  */
-class ResolveMeta implements BuilderPartsResolverInterface
+class ResolveMeta implements ResolverInterface
 {
     /**
      * @var array

Diff for: InventoryInStorePickup/Model/SearchCriteria/ResolveScopeFilter.php

@@ -13,7 +13,7 @@
 use Magento\InventoryApi\Api\Data\StockSourceLinkInterface;
 use Magento\InventoryApi\Api\GetStockSourceLinksInterface;
 use Magento\InventoryInStorePickupApi\Api\Data\SearchRequestInterface;
-use Magento\InventoryInStorePickupApi\Model\SearchCriteria\BuilderPartsResolverInterface;
+use Magento\InventoryInStorePickupApi\Model\SearchCriteria\ResolverInterface;
 use Magento\InventoryInStorePickupApi\Model\SearchCriteria\SearchCriteriaBuilderDecorator;
 use Magento\InventorySalesApi\Api\StockResolverInterface;
 
@@ -22,7 +22,7 @@
  *
  * In case of Distance Filter present in Search Request, the filter will not be added.
  */
-class ResolveScopeFilter implements BuilderPartsResolverInterface
+class ResolveScopeFilter implements ResolverInterface
 {
     /**
      * @var StockResolverInterface

Diff for: InventoryInStorePickupApi/Model/SearchCriteria/BuilderPartsResolverInterface.php renamed to InventoryInStorePickupApi/Model/SearchCriteria/ResolverInterface.php

@@ -10,11 +10,11 @@
 use Magento\InventoryInStorePickupApi\Api\Data\SearchRequestInterface;
 
 /**
- * Resolve Search Request into Search Criteria Builder parts.
+ * Resolve Search Request into framework Search Criteria Builder parameters.
  *
  * @api
  */
-interface BuilderPartsResolverInterface
+interface ResolverInterface
 {
     /**
      * Resolve Search Request and place it into Search Criteria Builder parts.

Diff for: InventoryInStorePickupApi/Model/SearchCriteriaResolverChain.php

@@ -9,7 +9,7 @@
 
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\InventoryInStorePickupApi\Api\Data\SearchRequestInterface;
-use Magento\InventoryInStorePickupApi\Model\SearchCriteria\BuilderPartsResolverInterface;
+use Magento\InventoryInStorePickupApi\Model\SearchCriteria\ResolverInterface;
 use Magento\InventoryInStorePickupApi\Model\SearchCriteria\SearchCriteriaBuilderDecoratorFactory;
 
 /**
@@ -23,13 +23,13 @@ class SearchCriteriaResolverChain implements SearchCriteriaResolverInterface
     private $searchCriteriaBuilderFactory;
 
     /**
-     * @var BuilderPartsResolverInterface[]
+     * @var ResolverInterface[]
      */
     private $resolvers;
 
     /**
      * @param SearchCriteriaBuilderDecoratorFactory $searchCriteriaBuilderFactory
-     * @param BuilderPartsResolverInterface[] $resolvers
+     * @param ResolverInterface[] $resolvers
      */
     public function __construct(
         SearchCriteriaBuilderDecoratorFactory $searchCriteriaBuilderFactory,
@@ -58,17 +58,17 @@ public function resolve(SearchRequestInterface $searchRequest): SearchCriteriaIn
     /**
      * Validate input array.
      *
-     * @param BuilderPartsResolverInterface[] $resolvers
+     * @param ResolverInterface[] $resolvers
      */
     private function validateResolvers(array $resolvers): void
     {
         foreach ($resolvers as $resolver) {
-            if (!$resolver instanceof BuilderPartsResolverInterface) {
+            if (!$resolver instanceof ResolverInterface) {
                 throw new \InvalidArgumentException(
                     sprintf(
                         'Pickup Locations Search Criteria Resolver must implement %s.' .
                         '%s has been received instead.',
-                        BuilderPartsResolverInterface::class,
+                        ResolverInterface::class,
                         get_class($resolver)
                     )
                 );