Merge branch 'MAGETWO-67466' into develop-prs-isolated

vrann · vrann · commit 2fbe2935e40e · 2017-04-17T20:46:32.000-05:00
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
@@ -116,6 +116,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * URL rewrite model
      *
      * @var \Magento\UrlRewrite\Model\UrlRewrite
+     * @deprecated since 2.2.0
      */
     protected $_urlRewrite;
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Map/DatabaseMapInterface.php b/app/code/Magento/CatalogUrlRewrite/Model/Map/DatabaseMapInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\CatalogUrlRewrite\Model\Map;
 
-use Magento\Framework\DB\Select;
-
 /**
  * Interface for a mysql data type of a map
  *
diff --git a/app/code/Magento/UrlRewrite/Model/MergeDataProvider.php b/app/code/Magento/UrlRewrite/Model/MergeDataProvider.php
@@ -11,6 +11,7 @@
  * This class is to be used as a container for new generated url rewrites by adding new ones using merge method
  * Removes duplicates for a set/array of Url Rewrites based on the unique key of the url_rewrites table
  *
+ * @api
  */
 class MergeDataProvider
 {
diff --git a/app/code/Magento/UrlRewrite/Model/StorageInterface.php b/app/code/Magento/UrlRewrite/Model/StorageInterface.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\UrlRewrite\Model;
 
+/**
+ * @api
+ */
 interface StorageInterface extends UrlFinderInterface, UrlPersistInterface
 {
 }
diff --git a/app/code/Magento/UrlRewrite/Model/UrlFinderInterface.php b/app/code/Magento/UrlRewrite/Model/UrlFinderInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * Url Finder Interface
+ * @api
  */
 interface UrlFinderInterface
 {
diff --git a/app/code/Magento/UrlRewrite/Model/UrlPersistInterface.php b/app/code/Magento/UrlRewrite/Model/UrlPersistInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * Url Persist Interface
+ * @api
  */
 interface UrlPersistInterface
 {
diff --git a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php
@@ -11,6 +11,7 @@
 
 /**
  * Data abstract class for url storage
+ * @api
  */
 class UrlRewrite extends AbstractSimpleObject
 {

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements`
`116`	`116`	`* URL rewrite model`
`117`	`117`	`*`
`118`	`118`	`* @var \Magento\UrlRewrite\Model\UrlRewrite`
	`119`	`+ * @deprecated since 2.2.0`
`119`	`120`	`*/`
`120`	`121`	`protected $_urlRewrite;`
`121`	`122`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\CatalogUrlRewrite\Model\Map;`
`7`	`7`
`8`		`-use Magento\Framework\DB\Select;`
`9`		`-`
`10`	`8`	`/**`
`11`	`9`	`* Interface for a mysql data type of a map`
`12`	`10`	`*`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`* This class is to be used as a container for new generated url rewrites by adding new ones using merge method`
`12`	`12`	`* Removes duplicates for a set/array of Url Rewrites based on the unique key of the url_rewrites table`
`13`	`13`	`*`
	`14`	`+ * @api`
`14`	`15`	`*/`
`15`	`16`	`class MergeDataProvider`
`16`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\UrlRewrite\Model;`
`7`	`7`
	`8`	`+/**`
	`9`	`+ * @api`
	`10`	`+ */`
`8`	`11`	`interface StorageInterface extends UrlFinderInterface, UrlPersistInterface`
`9`	`12`	`{`
`10`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Url Finder Interface`
	`10`	`+ * @api`
`10`	`11`	`*/`
`11`	`12`	`interface UrlFinderInterface`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Url Persist Interface`
	`10`	`+ * @api`
`10`	`11`	`*/`
`11`	`12`	`interface UrlPersistInterface`
`12`	`13`	`{`