MAGETWO-36095: Remove Banners API annotation

Author: Maxim Shikula

app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php

@@ -79,7 +79,7 @@ protected function _toHtml()
     /**
      * Returns captcha model
      *
-     * @return \Magento\Captcha\Model\ModelInterface
+     * @return \Magento\Captcha\Model\CaptchaInterface
      */
     public function getCaptchaModel()
     {

app/code/Magento/Captcha/Helper/Data.php

@@ -81,7 +81,7 @@ public function __construct(
      * Get Captcha
      *
      * @param string $formId
-     * @return \Magento\Captcha\Model\ModelInterface
+     * @return \Magento\Captcha\Model\CaptchaInterface
      */
     public function getCaptcha($formId)
     {

app/code/Magento/Captcha/Model/CaptchaFactory.php

@@ -27,17 +27,17 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $captchaType
      * @param string $formId
-     * @return \Magento\Captcha\Model\ModelInterface
+     * @return \Magento\Captcha\Model\CaptchaInterface
      * @throws \InvalidArgumentException
      */
     public function create($captchaType, $formId)
     {
         $className = 'Magento\Captcha\Model\\' . ucfirst($captchaType);
 
         $instance = $this->_objectManager->create($className, ['formId' => $formId]);
-        if (!$instance instanceof \Magento\Captcha\Model\ModelInterface) {
+        if (!$instance instanceof \Magento\Captcha\Model\CaptchaInterface) {
             throw new \InvalidArgumentException(
-                $className . ' does not implement \Magento\Captcha\Model\ModelInterface'
+                $className . ' does not implement \Magento\Captcha\Model\CaptchaInterface'
             );
         }
         return $instance;

app/code/Magento/Captcha/Model/ModelInterface.php renamed to app/code/Magento/Captcha/Model/CaptchaInterface.php

@@ -12,7 +12,7 @@
  *
  * @api
  */
-interface ModelInterface
+interface CaptchaInterface
 {
     /**
      * Generates captcha

app/code/Magento/Captcha/Model/DefaultModel.php

@@ -10,7 +10,7 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class DefaultModel extends \Zend_Captcha_Image implements \Magento\Captcha\Model\ModelInterface
+class DefaultModel extends \Zend_Captcha_Image implements \Magento\Captcha\Model\CaptchaInterface
 {
     /**
      * Key in session for captcha code

app/code/Magento/Captcha/Test/Unit/Model/CaptchaFactoryTest.php

@@ -58,7 +58,7 @@ public function testCreateNegative()
             'InvalidArgumentException',
             'Magento\Captcha\Model\\' . ucfirst(
                 $captchaType
-            ) . ' does not implement \Magento\Captcha\Model\ModelInterface'
+            ) . ' does not implement \Magento\Captcha\Model\CaptchaInterface'
         );
 
         $this->assertEquals($defaultCaptchaMock, $this->_model->create($captchaType, 'form_id'));

app/code/Magento/Widget/Model/Widget.php

@@ -10,8 +10,6 @@
 
 /**
  * Widget model for different purposes
- *
- * @api
  */
 class Widget
 {
@@ -86,6 +84,7 @@ public function __construct(
      *
      * @param string $type Widget type
      * @return null|array
+     * @api
      */
     public function getWidgetByClassType($type)
     {
@@ -108,6 +107,7 @@ public function getWidgetByClassType($type)
      *
      * @param string $type Widget type
      * @return null|\Magento\Framework\Simplexml\Element
+     * @api
      */
     public function getConfigAsXml($type)
     {
@@ -121,6 +121,7 @@ public function getConfigAsXml($type)
      * @return \Magento\Framework\Object
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @api
      */
     public function getConfigAsObject($type)
     {
@@ -185,6 +186,7 @@ public function getConfigAsObject($type)
      *
      * @param array $filters Key-value array of filters for widget node properties
      * @return array
+     * @api
      */
     public function getWidgets($filters = [])
     {
@@ -215,6 +217,7 @@ public function getWidgets($filters = [])
      *
      * @param array $filters Key-value array of filters for widget node properties
      * @return array
+     * @api
      */
     public function getWidgetsArray($filters = [])
     {
@@ -241,6 +244,7 @@ public function getWidgetsArray($filters = [])
      * @param array $params Pre-configured Widget Params
      * @param bool $asIs Return result as widget directive(true) or as placeholder image(false)
      * @return string Widget directive ready to parse
+     * @api
      */
     public function getWidgetDeclaration($type, $params = [], $asIs = true)
     {