MAGETWO-95259: CatalogSearch module deprecation must be reverted

paliarush · paliarush · commit 2d22b2040522 · 2018-10-12T15:34:41.000-05:00
- Removed deprecation of the classes necessary for the work of ElasticSearch (or any other search adapter)
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Result.php b/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
@@ -18,8 +18,6 @@
  *
  * @api
  * @since 100.0.2
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class Result extends Template
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php
@@ -15,8 +15,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as AttributeCollection;
 
 /**
- * @deprecated
- * @see \Magento\ElasticSearch
+ * Aggregation resolver.
  */
 class AggregationResolver implements AggregationResolverInterface
 {
@@ -79,7 +78,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function resolve(RequestInterface $request, array $documentIds)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php
@@ -17,8 +17,6 @@
  * Request checker for catalog view.
  *
  * Checks catalog view query whether required to collect all attributes for entity.
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class CatalogView implements RequestCheckerInterface
 {
@@ -53,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isApplicable(RequestInterface $request)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php
@@ -10,8 +10,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * @deprecated
- * @see \Magento\ElasticSearch
+ * Composite request checker.
  */
 class RequestCheckerComposite implements RequestCheckerInterface
 {
@@ -57,7 +56,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isApplicable(RequestInterface $request)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerInterface.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerInterface.php
@@ -9,9 +9,6 @@
 
 /**
  * RequestCheckerInterface provides the interface to work with query checkers.
- *
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 interface RequestCheckerInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -43,8 +43,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class Advanced extends \Magento\Framework\Model\AbstractModel
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php b/app/code/Magento/CatalogSearch/Model/Advanced/Request/Builder.php
@@ -8,14 +8,16 @@
 use Magento\Framework\Search\Request\Builder as RequestBuilder;
 
 /**
+ * Catalog search advanced request builder.
+ *
  * @api
  * @since 100.0.2
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class Builder extends RequestBuilder
 {
     /**
+     * Bind value to query.
+     *
      * @param string $attributeCode
      * @param array|string $attributeValue
      * @return void
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -22,9 +22,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
- *
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class Full
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Action.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Action.php
@@ -24,8 +24,6 @@ class Action extends AbstractIndexerPlugin
      * @return ProductAction
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @deprecated
-     * @see ElasticSearch module is default search engine starting from 2.3. CatalogSearch would be removed in 2.4
      */
     public function afterUpdateAttributes(
         ProductAction $subject,
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
@@ -15,10 +15,10 @@
 use Magento\Framework\Search\Request\IndexScopeResolverInterface;
 
 /**
+ * Catalog search index structure.
+ *
  * @api
  * @since 100.0.2
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class IndexStructure implements IndexStructureInterface
 {
@@ -45,9 +45,7 @@ public function __construct(
     }
 
     /**
-     * @param string $index
-     * @param Dimension[] $dimensions
-     * @return void
+     * @inheritdoc
      */
     public function delete($index, array $dimensions = [])
     {
@@ -58,18 +56,16 @@ public function delete($index, array $dimensions = [])
     }
 
     /**
-     * @param string $index
-     * @param array $fields
-     * @param array $dimensions
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @return void
+     * @inheritdoc
      */
     public function create($index, array $fields, array $dimensions = [])
     {
         $this->createFulltextIndex($this->indexScopeResolver->resolve($index, $dimensions));
     }
 
     /**
+     * Create fulltext index table.
+     *
      * @param string $tableName
      * @throws \Zend_Db_Exception
      * @return void
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureProxy.php
@@ -8,8 +8,7 @@
 use Magento\Framework\Indexer\IndexStructureInterface;
 
 /**
- * @deprecated
- * @see \Magento\ElasticSearch
+ * Catalog search index structure proxy.
  */
 class IndexStructureProxy implements IndexStructureInterface
 {
@@ -33,7 +32,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(
         $index,
@@ -43,7 +42,7 @@ public function delete(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function create(
         $index,
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherInterface.php
@@ -6,11 +6,10 @@
 namespace Magento\CatalogSearch\Model\Indexer;
 
 /**
- * Provides a functionality to replace main index with its temporary representation
+ * Provides a functionality to replace main index with its temporary representation.
+ *
  * @api
  * @since 100.2.0
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 interface IndexSwitcherInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexSwitcherProxy.php
@@ -11,9 +11,6 @@
 
 /**
  * Proxy for adapter-specific index switcher
- *
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class IndexSwitcherProxy implements IndexSwitcherInterface
 {
@@ -54,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      *
      * As index switcher is an optional part of the search SPI, it may be not defined by a search engine.
      * It is especially reasonable for search engines with pre-defined indexes declaration (like Sphinx)
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
@@ -9,11 +9,7 @@
 use Magento\Framework\Search\Request\Dimension;
 
 /**
- * Implementation of IndexScopeResolverInterface which resolves index scope dynamically
- * depending on current scope state
- *
- * @deprecated
- * @see \Magento\ElasticSearch
+ * Implementation of IndexScopeResolverInterface which resolves index scope dynamically depending on current scope state
  */
 class ScopeProxy implements \Magento\Framework\Search\Request\IndexScopeResolverInterface
 {
@@ -67,9 +63,7 @@ private function create($state)
     }
 
     /**
-     * @param string $index
-     * @param Dimension[] $dimensions
-     * @return string
+     * @inheritdoc
      */
     public function resolve($index, array $dimensions)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
@@ -18,9 +18,6 @@
  * The 'use_temporary_table' state is an opposite for 'use_main_table'
  *   which means that default indexer table should be left unchanged during indexation
  *   and temporary table should be used instead.
- *
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class State
 {
@@ -34,6 +31,7 @@ class State
 
     /**
      * Set the state to use temporary Index
+     *
      * @return void
      */
     public function useTemporaryIndex()
@@ -43,6 +41,7 @@ public function useTemporaryIndex()
 
     /**
      * Set the state to use regular Index
+     *
      * @return void
      */
     public function useRegularIndex()
@@ -51,6 +50,8 @@ public function useRegularIndex()
     }
 
     /**
+     * Get state.
+     *
      * @return string
      */
     public function getState()
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php
@@ -8,11 +8,8 @@
 /**
  * Advanced Catalog Search resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class Advanced extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -17,14 +17,13 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 
 /**
- * Collection Advanced
+ * Advanced search collection
+ *
+ * This collection should be refactored to not have dependencies on MySQL-specific implementation.
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -41,6 +40,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 
     /**
      * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory
+     * @deprecated There must be no dependencies on specific adapter in generic search implementation
      */
     private $temporaryStorageFactory;
 
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
@@ -14,8 +14,6 @@
  *
  * @api
  * @since 100.0.2
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class Fulltext extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
@@ -72,6 +72,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 
     /**
      * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory
+     * @deprecated There must be no dependencies on specific adapter in generic search implementation
      */
     private $temporaryStorageFactory;
 
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
@@ -12,8 +12,6 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection implements
     \Magento\Search\Model\SearchCollectionInterface
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
@@ -14,10 +14,10 @@
 use Magento\Framework\Search\Request\QueryInterface;
 
 /**
+ * Catalog search request generator.
+ *
  * @api
  * @since 100.0.2
- * @deprecated
- * @see \Magento\ElasticSearch
  */
 class RequestGenerator
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
@@ -34,7 +34,7 @@ public function __construct(ResourceConnection $resource)
     }
 
     /**
-     * Wrap query with parentheces.
+     * Wrap query with parentheses.
      *
      * @param string $query
      * @return string

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`*`
`19`	`19`	`* @api`
`20`	`20`	`* @since 100.0.2`
`21`		`- * @deprecated`
`22`		`- * @see \Magento\ElasticSearch`
`23`	`21`	`*/`
`24`	`22`	`class Result extends Template`
`25`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@`
`15`	`15`	`use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as AttributeCollection;`
`16`	`16`
`17`	`17`	`/**`
`18`		`- * @deprecated`
`19`		`- * @see \Magento\ElasticSearch`
	`18`	`+ * Aggregation resolver.`
`20`	`19`	`*/`
`21`	`20`	`class AggregationResolver implements AggregationResolverInterface`
`22`	`21`	`{`
`@@ -79,7 +78,7 @@ public function __construct(`
`79`	`78`	`}`
`80`	`79`
`81`	`80`	`/**`
`82`		`- * {@inheritdoc}`
	`81`	`+ * @inheritdoc`
`83`	`82`	`*/`
`84`	`83`	`public function resolve(RequestInterface $request, array $documentIds)`
`85`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@`
`17`	`17`	`* Request checker for catalog view.`
`18`	`18`	`*`
`19`	`19`	`* Checks catalog view query whether required to collect all attributes for entity.`
`20`		`- * @deprecated`
`21`		`- * @see \Magento\ElasticSearch`
`22`	`20`	`*/`
`23`	`21`	`class CatalogView implements RequestCheckerInterface`
`24`	`22`	`{`
`@@ -53,7 +51,7 @@ public function __construct(`
`53`	`51`	`}`
`54`	`52`
`55`	`53`	`/**`
`56`		`- * {@inheritdoc}`
	`54`	`+ * @inheritdoc`
`57`	`55`	`*/`
`58`	`56`	`public function isApplicable(RequestInterface $request)`
`59`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,7 @@`
`10`	`10`	`use Magento\Store\Model\StoreManagerInterface;`
`11`	`11`
`12`	`12`	`/**`
`13`		`- * @deprecated`
`14`		`- * @see \Magento\ElasticSearch`
	`13`	`+ * Composite request checker.`
`15`	`14`	`*/`
`16`	`15`	`class RequestCheckerComposite implements RequestCheckerInterface`
`17`	`16`	`{`
`@@ -57,7 +56,7 @@ public function __construct(`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`/**`
`60`		`- * {@inheritdoc}`
	`59`	`+ * @inheritdoc`
`61`	`60`	`*/`
`62`	`61`	`public function isApplicable(RequestInterface $request)`
`63`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,6 @@`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* RequestCheckerInterface provides the interface to work with query checkers.`
`12`		`- *`
`13`		`- * @deprecated`
`14`		`- * @see \Magento\ElasticSearch`
`15`	`12`	`*/`
`16`	`13`	`interface RequestCheckerInterface`
`17`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@`
`43`	`43`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`44`	`44`	`* @api`
`45`	`45`	`* @since 100.0.2`
`46`		`- * @deprecated`
`47`		`- * @see \Magento\ElasticSearch`
`48`	`46`	`*/`
`49`	`47`	`class Advanced extends \Magento\Framework\Model\AbstractModel`
`50`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ class Action extends AbstractIndexerPlugin`
`24`	`24`	`* @return ProductAction`
`25`	`25`	`*`
`26`	`26`	`* @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`27`		`- * @deprecated`
`28`		`- * @see ElasticSearch module is default search engine starting from 2.3. CatalogSearch would be removed in 2.4`
`29`	`27`	`*/`
`30`	`28`	`public function afterUpdateAttributes(`
`31`	`29`	`ProductAction $subject,`