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

Author: vpaladiychuk

app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php

@@ -24,12 +24,19 @@ public function execute()
             $this->messageManager->addError(__('This rule no longer exists.'));
             $this->_redirect('tax/*/');
             return;
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
-        } catch (\Exception $e) {
-            $this->messageManager->addError(__('Something went wrong deleting this tax rule.'));
         }
 
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
+        return $this->getDefaultRedirect();
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @return \Magento\Framework\Controller\Result\Redirect
+     */
+    public function getDefaultRedirect()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        return $resultRedirect->setUrl($this->_redirect->getRedirectUrl($this->getUrl('*')));
     }
 }

app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php

@@ -15,29 +15,23 @@ class Delete extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
      */
     public function execute()
     {
-        $redirectBack = (bool)$this->getRequest()->getParam('back', false);
         $themeId = $this->getRequest()->getParam('id');
-        try {
-            if ($themeId) {
-                /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
-                $theme = $this->_objectManager->create('Magento\Framework\View\Design\ThemeInterface')->load($themeId);
-                if (!$theme->getId()) {
-                    throw new \InvalidArgumentException(sprintf('We cannot find a theme with id "%1".', $themeId));
-                }
-                if (!$theme->isVirtual()) {
-                    throw new \InvalidArgumentException(
-                        sprintf('Only virtual theme is possible to delete and theme "%s" isn\'t virtual', $themeId)
-                    );
-                }
-                $theme->delete();
-                $this->messageManager->addSuccess(__('You deleted the theme.'));
+        if ($themeId) {
+            /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+            $theme = $this->_objectManager->create('Magento\Framework\View\Design\ThemeInterface')->load($themeId);
+            if (!$theme->getId()) {
+                throw new \InvalidArgumentException(sprintf('We cannot find a theme with id "%1".', $themeId));
+            }
+            if (!$theme->isVirtual()) {
+                throw new \InvalidArgumentException(
+                    sprintf('Only virtual theme is possible to delete and theme "%s" isn\'t virtual', $themeId)
+                );
             }
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
-        } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We cannot delete the theme.'));
-            $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
+            $theme->delete();
+            $this->messageManager->addSuccess(__('You deleted the theme.'));
         }
+
+        $redirectBack = (bool)$this->getRequest()->getParam('back', false);
         /**
          * @todo Temporary solution. Theme module should not know about the existence of editor module.
          */