MAGETWO-34995: Refactor controllers from the list (Part2)

Author: Dmytro Poperechnyy

app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php

@@ -9,21 +9,29 @@
 class PriceAll extends \Magento\ProductAlert\Controller\Unsubscribe
 {
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
-        try {
-            $this->_objectManager->create(
-                'Magento\ProductAlert\Model\Price'
-            )->deleteCustomer(
-                $this->_customerSession->getCustomerId(),
-                $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
-            );
-            $this->messageManager->addSuccess(__('You will no longer receive price alerts for this product.'));
-        } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to update the alert subscription.'));
-        }
-        $this->_redirect('customer/account/');
+        $this->_objectManager->create(
+            'Magento\ProductAlert\Model\Price'
+        )->deleteCustomer(
+            $this->_customerSession->getCustomerId(),
+            $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
+        );
+        $this->messageManager->addSuccess(__('You will no longer receive price alerts for this product.'));
+
+        return $this->getDefaultRedirect();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\Framework\Controller\Result\Redirect
+     */
+    public function getDefaultRedirect()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        return $resultRedirect->setPath('customer/account/');
     }
 }

app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php

@@ -9,21 +9,29 @@
 class StockAll extends \Magento\ProductAlert\Controller\Unsubscribe
 {
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
-        try {
-            $this->_objectManager->create(
-                'Magento\ProductAlert\Model\Stock'
-            )->deleteCustomer(
-                $this->_customerSession->getCustomerId(),
-                $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
-            );
-            $this->messageManager->addSuccess(__('You will no longer receive stock alerts.'));
-        } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to update the alert subscription.'));
-        }
-        $this->_redirect('customer/account/');
+        $this->_objectManager->create(
+            'Magento\ProductAlert\Model\Stock'
+        )->deleteCustomer(
+            $this->_customerSession->getCustomerId(),
+            $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
+        );
+        $this->messageManager->addSuccess(__('You will no longer receive stock alerts.'));
+
+        return $this->getDefaultRedirect();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\Framework\Controller\Result\Redirect
+     */
+    public function getDefaultRedirect()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        return $resultRedirect->setPath('customer/account/');
     }
 }

app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php

@@ -8,28 +8,36 @@
 
 class Delete extends \Magento\Review\Controller\Adminhtml\Product
 {
+    /**
+     * @var int
+     */
+    protected $reviewId;
+
     /**
      * @return void
      */
     public function execute()
     {
-        $reviewId = $this->getRequest()->getParam('id', false);
-        try {
-            $this->_reviewFactory->create()->setId($reviewId)->aggregate()->delete();
+        $this->reviewId = $this->getRequest()->getParam('id', false);
+        $this->_reviewFactory->create()->setId($this->reviewId)->aggregate()->delete();
 
-            $this->messageManager->addSuccess(__('The review has been deleted.'));
-            if ($this->getRequest()->getParam('ret') == 'pending') {
-                $this->getResponse()->setRedirect($this->getUrl('review/*/pending'));
-            } else {
-                $this->getResponse()->setRedirect($this->getUrl('review/*/'));
-            }
-            return;
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
-        } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Something went wrong  deleting this review.'));
+        $this->messageManager->addSuccess(__('The review has been deleted.'));
+        if ($this->getRequest()->getParam('ret') == 'pending') {
+            $this->getResponse()->setRedirect($this->getUrl('review/*/pending'));
+        } else {
+            $this->getResponse()->setRedirect($this->getUrl('review/*/'));
         }
+        return;
+    }
 
-        $this->_redirect('review/*/edit/', ['id' => $reviewId]);
+    /**
+     * {@inheritdoc}
+     *
+     * @return \Magento\Backend\Model\View\Result\Redirect
+     */
+    public function getDefaultRedirect()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        return $resultRedirect->setPath('review/*/edit/', ['id' => $this->reviewId]);
     }
 }