MAGETWO-95259: CatalogSearch module deprecation must be reverted

buskamuza · buskamuza · commit b82bec831672 · 2018-09-28T13:51:17.000-05:00
- removed deprecation from generic catalog search classes
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
@@ -23,8 +23,6 @@
 /**
  * @api
  * @since 100.0.2
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Form extends Template
 {
diff --git a/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php b/app/code/Magento/CatalogSearch/Block/Plugin/FrontTabPlugin.php
@@ -11,9 +11,7 @@
 use Magento\Framework\Data\Form\Element\Fieldset;
 
 /**
- * Plugin for Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
+ * Add Search Weight field to the product attribute add/edit tab
  */
 class FrontTabPlugin
 {
diff --git a/app/code/Magento/CatalogSearch/Block/Result.php b/app/code/Magento/CatalogSearch/Block/Result.php
@@ -18,8 +18,6 @@
  *
  * @api
  * @since 100.0.2
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Result extends Template
 {
diff --git a/app/code/Magento/CatalogSearch/Block/SearchTermsLog.php b/app/code/Magento/CatalogSearch/Block/SearchTermsLog.php
@@ -9,9 +9,7 @@
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 /**
- * Class for logging search terms on cached pages
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
+ * Provider of the information on whether the page is cacheable, so that AJAX-based logging of terms can be triggered
  */
 class SearchTermsLog implements ArgumentInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Index.php
@@ -10,10 +10,6 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
@@ -12,10 +12,6 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\UrlFactory;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class Result extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
@@ -15,10 +15,6 @@
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\PopularSearchTerms;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php b/app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php
@@ -15,8 +15,6 @@
 
 /**
  * Controller for save search terms
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Save extends \Magento\Framework\App\Action\Action
 {
diff --git a/app/code/Magento/CatalogSearch/Helper/Data.php b/app/code/Magento/CatalogSearch/Helper/Data.php
@@ -10,8 +10,6 @@
  *
  * @api
  * @since 100.0.2
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Data extends \Magento\Search\Helper\Data
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/AdvancedSearch.php
@@ -12,8 +12,6 @@
  * Request checker for advanced search.
  *
  * Checks advanced search query whether required to collect all attributes for entity.
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class AdvancedSearch implements RequestCheckerInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Options.php b/app/code/Magento/CatalogSearch/Model/Adapter/Options.php
@@ -12,8 +12,6 @@
 /**
  * @api
  * @since 100.0.2
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Options implements OptionsInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php b/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
@@ -8,8 +8,6 @@
 /**
  * @api
  * @since 100.0.2
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Engine extends \Magento\Framework\App\Config\Value
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php b/app/code/Magento/CatalogSearch/Model/Attribute/SearchWeight.php
@@ -11,9 +11,6 @@
  * which is used to boost matches by specific attributes.
  *
  * This is part of search accuracy customization functionality.
- *
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class SearchWeight
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
@@ -13,10 +13,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
 use Magento\Store\Model\ScopeInterface;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class DataProvider implements DataProviderInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
@@ -19,8 +19,6 @@
  *
  * @api
  * @since 100.0.2
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Fulltext implements
     \Magento\Framework\Indexer\ActionInterface,
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -16,8 +16,6 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @api
  * @since 100.0.3
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class DataProvider
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/Category.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/Category.php
@@ -12,9 +12,6 @@
 
 /**
  * Perform indexer invalidation after a category delete.
- *
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Category
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/AbstractPlugin.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/AbstractPlugin.php
@@ -10,9 +10,6 @@
 
 /**
  * Abstract plugin for indexers
- *
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 abstract class AbstractPlugin
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
@@ -7,10 +7,6 @@
 
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class Attribute extends AbstractPlugin
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php
@@ -9,10 +9,6 @@
 use Magento\Catalog\Model\ResourceModel\Category as ResourceCategory;
 use Magento\Framework\Model\AbstractModel;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class Category extends AbstractPlugin
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php
@@ -9,10 +9,6 @@
 use Magento\Catalog\Model\ResourceModel\Product as ResourceProduct;
 use Magento\Framework\Model\AbstractModel;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class Product extends AbstractPlugin
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php
@@ -12,9 +12,6 @@
 
 /**
  * Plugin for Magento\Store\Model\ResourceModel\Group
- *
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Group extends AbstractIndexerPlugin
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php
@@ -12,9 +12,6 @@
 
 /**
  * Plugin for Magento\Store\Model\ResourceModel\Store
- *
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class View extends AbstractIndexerPlugin
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Processor.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Processor.php
@@ -12,8 +12,6 @@
  * Class Processor
  * @api
  * @since 100.1.0
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Processor extends AbstractProcessor
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
@@ -11,10 +11,6 @@
 use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Event\ObserverInterface;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class Store implements ObserverInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructureFactory.php
@@ -12,8 +12,6 @@
 /**
  * @api
  * @since 100.1.0
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class IndexStructureFactory
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandlerFactory.php
@@ -12,8 +12,6 @@
 /**
  * @api
  * @since 100.0.2
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class IndexerHandlerFactory
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php b/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
@@ -9,10 +9,6 @@
 use Magento\Framework\Mview\ActionInterface;
 use Magento\Framework\Indexer\IndexerInterfaceFactory;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class Action implements ActionInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php b/app/code/Magento/CatalogSearch/Model/Layer/Category/ItemCollectionProvider.php
@@ -9,10 +9,6 @@
 use Magento\Catalog\Model\Layer\ItemCollectionProviderInterface;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class ItemCollectionProvider implements ItemCollectionProviderInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -9,8 +9,6 @@
 
 /**
  * Layer attribute filter
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Attribute extends AbstractFilter
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
@@ -10,9 +10,6 @@
 
 /**
  * Layer category filter
- *
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Category extends AbstractFilter
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
@@ -9,9 +9,6 @@
 
 /**
  * Layer decimal filter
- *
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  */
 class Decimal extends AbstractFilter
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -10,8 +10,6 @@
 /**
  * Layer price filter based on Search API
  *
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Price extends AbstractFilter
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/Plugin/CollectionFilter.php
@@ -9,10 +9,6 @@
 use Magento\Catalog\Model\Category;
 use Magento\Search\Model\QueryFactory;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class CollectionFilter
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
@@ -9,10 +9,6 @@
 
 use Magento\Catalog\Model\Layer\StateKeyInterface;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey implements StateKeyInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Price/Interval.php b/app/code/Magento/CatalogSearch/Model/Price/Interval.php
@@ -7,10 +7,6 @@
 
 use Magento\Framework\Search\Dynamic\IntervalInterface;
 
-/**
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 class Interval implements IntervalInterface
 {
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
@@ -3,16 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\CatalogSearch\Model\ResourceModel;
 
 /**
  * CatalogSearch Index Engine Interface
  *
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
-namespace Magento\CatalogSearch\Model\ResourceModel;
-
-/**
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
@@ -4,18 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Catalog Search engine provider
- *
- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
- *             will replace it as the default search engine.
- */
 namespace Magento\CatalogSearch\Model\ResourceModel;
 
-use Magento\CatalogSearch\Model\ResourceModel\EngineInterface;
 use Magento\Framework\Search\EngineResolverInterface;
 
 /**
+ * Catalog Search engine provider
+ *
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectStrategyInterface.php b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectStrategyInterface.php
diff --git a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
diff --git a/app/code/Magento/CatalogSearch/Model/Search/Catalog.php b/app/code/Magento/CatalogSearch/Model/Search/Catalog.php
diff --git a/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php b/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php
diff --git a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainer.php b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainer.php
diff --git a/app/code/Magento/CatalogSearch/Model/Source/Weight.php b/app/code/Magento/CatalogSearch/Model/Source/Weight.php
diff --git a/app/code/Magento/CatalogSearch/Plugin/EnableEavIndexer.php b/app/code/Magento/CatalogSearch/Plugin/EnableEavIndexer.php
diff --git a/app/code/Magento/Search/Model/Query.php b/app/code/Magento/Search/Model/Query.php

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`	`/**`
`24`	`24`	`* @api`
`25`	`25`	`* @since 100.0.2`
`26`		`- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}`
`27`		`- * will replace it as the default search engine.`
`28`	`26`	`*/`
`29`	`27`	`class Form extends Template`
`30`	`28`	`{`
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 CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}`
`22`		`- * will replace it as the default search engine.`
`23`	`21`	`*/`
`24`	`22`	`class Result extends Template`
`25`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* Controller for save search terms`
`18`		`- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}`
`19`		`- * will replace it as the default search engine.`
`20`	`18`	`*/`
`21`	`19`	`class Save extends \Magento\Framework\App\Action\Action`
`22`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`*`
`11`	`11`	`* @api`
`12`	`12`	`* @since 100.0.2`
`13`		`- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}`
`14`		`- * will replace it as the default search engine.`
`15`	`13`	`*/`
`16`	`14`	`class Data extends \Magento\Search\Helper\Data`
`17`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@`
`12`	`12`	`* Request checker for advanced search.`
`13`	`13`	`*`
`14`	`14`	`* Checks advanced search query whether required to collect all attributes for entity.`
`15`		`- * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}`
`16`		`- * will replace it as the default search engine.`
`17`	`15`	`*/`
`18`	`16`	`class AdvancedSearch implements RequestCheckerInterface`
`19`	`17`	`{`