Skip to content

Commit 45dce69

Browse files
authored
Merge pull request #1029 from magento-engcom/develop-prs-isolated
[Engcom] SSL for AMQP and @api annotations for URLRewrite and Indexer
2 parents 1a8dd8c + 2fbe293 commit 45dce69

22 files changed

+32
-71
lines changed

app/code/Magento/Catalog/Model/Category.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
116116
* URL rewrite model
117117
*
118118
* @var \Magento\UrlRewrite\Model\UrlRewrite
119+
* @deprecated since 2.2.0
119120
*/
120121
protected $_urlRewrite;
121122

app/code/Magento/CatalogUrlRewrite/Model/Map/DatabaseMapInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*/
66
namespace Magento\CatalogUrlRewrite\Model\Map;
77

8-
use Magento\Framework\DB\Select;
9-
108
/**
119
* Interface for a mysql data type of a map
1210
*

app/code/Magento/Indexer/Model/Processor/Handler.php

Lines changed: 0 additions & 39 deletions
This file was deleted.

app/code/Magento/UrlRewrite/Model/MergeDataProvider.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* This class is to be used as a container for new generated url rewrites by adding new ones using merge method
1212
* Removes duplicates for a set/array of Url Rewrites based on the unique key of the url_rewrites table
1313
*
14+
* @api
1415
*/
1516
class MergeDataProvider
1617
{

app/code/Magento/UrlRewrite/Model/StorageInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\UrlRewrite\Model;
77

8+
/**
9+
* @api
10+
*/
811
interface StorageInterface extends UrlFinderInterface, UrlPersistInterface
912
{
1013
}

app/code/Magento/UrlRewrite/Model/UrlFinderInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* Url Finder Interface
10+
* @api
1011
*/
1112
interface UrlFinderInterface
1213
{

app/code/Magento/UrlRewrite/Model/UrlPersistInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* Url Persist Interface
10+
* @api
1011
*/
1112
interface UrlPersistInterface
1213
{

app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
/**
1313
* Data abstract class for url storage
14+
* @api
1415
*/
1516
class UrlRewrite extends AbstractSimpleObject
1617
{

lib/internal/Magento/Framework/Indexer/ActionFactory.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*/
66
namespace Magento\Framework\Indexer;
77

8-
use Magento\Framework\Indexer\ActionInterface;
9-
108
class ActionFactory
119
{
1210
/**

lib/internal/Magento/Framework/Indexer/ActionInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\Framework\Indexer;
77

88
/**
9-
* @api
9+
* @api Implement custom Action Interface
1010
*/
1111
interface ActionInterface
1212
{

lib/internal/Magento/Framework/Indexer/BatchProviderInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
*
1414
* Can be used during indexation process to split large amount of data into batches
1515
* and process them one by one in order to reduce memory consumption and improve overall performance.
16+
*
17+
* @api retrieve Batches when implementing custom Indexer\Action
1618
*/
1719
interface BatchProviderInterface
1820
{

lib/internal/Magento/Framework/Indexer/FieldsetInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Framework\Indexer;
77

8+
/**
9+
* @api Implement custom Fieldset
10+
*/
811
interface FieldsetInterface
912
{
1013
/**

lib/internal/Magento/Framework/Indexer/FieldsetPool.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
use Magento\Framework\ObjectManagerInterface;
99

10+
/**
11+
* @api Retrieve Fieldset when implementing custom Indexer\Action
12+
*/
1013
class FieldsetPool
1114
{
1215
/**

lib/internal/Magento/Framework/Indexer/FilterInterface.php

Lines changed: 0 additions & 14 deletions
This file was deleted.

lib/internal/Magento/Framework/Indexer/HandlerInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
99

10+
/**
11+
* @api Implement custom Handler
12+
*/
1013
interface HandlerInterface
1114
{
1215
/**

lib/internal/Magento/Framework/Indexer/HandlerPool.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
use Magento\Framework\Indexer\Handler\DefaultHandler;
99
use Magento\Framework\ObjectManagerInterface;
1010

11+
/**
12+
* @api Instantiate save handler when implementing custom Indexer\Action
13+
*/
1114
class HandlerPool
1215
{
1316
/**

lib/internal/Magento/Framework/Indexer/IndexerRegistry.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Framework\Indexer;
77

8+
/**
9+
* @api Retrieve indexer by id, for example when indexer need to be invalidated
10+
*/
811
class IndexerRegistry
912
{
1013
/**

lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
use Magento\Framework\ObjectManagerInterface;
1010
use Magento\Framework\Indexer\SaveHandler\IndexerInterface as SaveHandlerInterface;
1111

12+
/**
13+
* @api Instantiate save handler when implementing custom Indexer\Action
14+
*/
1215
class SaveHandlerFactory
1316
{
1417
/**

lib/internal/Magento/Framework/Indexer/StateInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Framework\Indexer;
77

8+
/**
9+
* @api Retrieve status of the Indexer
10+
*/
811
interface StateInterface
912
{
1013
/**

lib/internal/Magento/Framework/Indexer/Table/Strategy.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
*/
66
namespace Magento\Framework\Indexer\Table;
77

8-
/**
9-
* Class Strategy
10-
* @package Magento\Indexer
11-
*/
128
class Strategy implements StrategyInterface
139
{
1410
/**

lib/internal/Magento/Framework/Indexer/Table/StrategyInterface.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66

77
namespace Magento\Framework\Indexer\Table;
88

9-
/**
10-
* Interface StrategyInterface
11-
* @package Magento\Indexer
12-
*/
139
interface StrategyInterface
1410
{
1511
const IDX_SUFFIX = '_idx';

lib/internal/Magento/Framework/Mview/View/SubscriptionFactory.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
*/
66
namespace Magento\Framework\Mview\View;
77

8-
/**
9-
* Class SubscriptionFactory
10-
* @package Magento\Framework\Mview\View
11-
*
12-
*/
138
class SubscriptionFactory extends AbstractFactory
149
{
1510
/**

0 commit comments

Comments
 (0)