refactor code

Author: AnshuMishra17

app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php

@@ -5,10 +5,11 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml;
 
-use Magento\Framework\App\ObjectManager;
-use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
 
-abstract class Agreement extends \Magento\Backend\App\Action
+abstract class Agreement extends Action
 {
     /**
      * Authorization level of a basic admin session
@@ -23,35 +24,17 @@ abstract class Agreement extends \Magento\Backend\App\Action
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
-    
-    /**
-     * @var CheckoutAgreementsRepositoryInterface
-     */
-    protected $_agreementRepository;
-    
-    /**
-     * @var \Magento\CheckoutAgreements\Model\AgreementFactory
-     */
-    protected $_agreementFactory;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param CheckoutAgreementsRepositoryInterface $agreementRepository
-     * @param \Magento\CheckoutAgreements\Model\AgreementFactory $agreementFactory
+     * @param Context $context
+     * @param Registry $coreRegistry
      * @codeCoverageIgnore
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Registry $coreRegistry,
-        CheckoutAgreementsRepositoryInterface $agreementRepository = null,
-        \Magento\CheckoutAgreements\Model\AgreementFactory $agreementFactory = null
+        Context $context,
+        Registry $coreRegistry
     ) {
         $this->_coreRegistry = $coreRegistry;
-        $this->_agreementRepository = $agreementRepository ?:
-                ObjectManager::getInstance()->get(CheckoutAgreementsRepositoryInterface::class);
-        $this->_agreementFactory = $agreementFactory ?:
-                ObjectManager::getInstance()->get(\Magento\CheckoutAgreements\Model\AgreementFactory::class);
         parent::__construct($context);
     }
 

app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php

@@ -6,15 +6,41 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+
+class Delete extends Agreement
 {
+    /**
+     * @var CheckoutAgreementsRepositoryInterface
+     */
+    private $agreementRepository;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param CheckoutAgreementsRepositoryInterface $agreementRepository
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        CheckoutAgreementsRepositoryInterface $agreementRepository = null
+    ) {
+        $this->agreementRepository = $agreementRepository ?:
+                ObjectManager::getInstance()->get(CheckoutAgreementsRepositoryInterface::class);
+        parent::__construct($context, $coreRegistry);
+    }
     /**
      * @return void
      */
     public function execute()
     {
         $id = (int)$this->getRequest()->getParam('id');
-        $repository = $this->_agreementRepository->get($id);
+        $repository = $this->agreementRepository->get($id);
         if (!$repository->getAgreementId()) {
             $this->messageManager->addError(__('This condition no longer exists.'));
             $this->_redirect('checkout/*/');
@@ -26,7 +52,7 @@ public function execute()
             $this->messageManager->addSuccess(__('You deleted the condition.'));
             $this->_redirect('checkout/*/');
             return;
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             $this->messageManager->addError($e->getMessage());
         } catch (\Exception $e) {
             $this->messageManager->addError(__('Something went wrong  while deleting this condition.'));

app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php

@@ -6,16 +6,43 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\CheckoutAgreements\Model\AgreementFactory;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\App\ObjectManager;
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit;
+
+class Edit extends Agreement
 {
+    /**
+     * @var AgreementFactory
+     */
+    private $agreementFactory;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param AgreementFactory $agreementFactory
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        AgreementFactory $agreementFactory = null
+    ) {
+        $this->agreementFactory = $agreementFactory ?:
+                ObjectManager::getInstance()->get(AgreementFactory::class);
+        parent::__construct($context, $coreRegistry);
+    }
     /**
      * @return void
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
     {
         $id = $this->getRequest()->getParam('id');
-        $agreementModel = $this->_agreementFactory->create();
+        $agreementModel = $this->agreementFactory->create();
 
         if ($id) {
             $agreementModel->load($id);
@@ -38,7 +65,7 @@ public function execute()
             $id ? __('Edit Condition') : __('New Condition')
         )->_addContent(
             $this->_view->getLayout()->createBlock(
-                \Magento\CheckoutAgreements\Block\Adminhtml\Agreement\Edit::class
+                Edit::class
             )->setData(
                 'action',
                 $this->getUrl('checkout/*/save')

app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php

@@ -6,20 +6,48 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 
-class Save extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\CheckoutAgreements\Model\AgreementFactory;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\App\ObjectManager;
+use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
+
+class Save extends Agreement
 {
+    /**
+     * @var AgreementFactory
+     */
+    private $agreementFactory;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param AgreementFactory $agreementFactory
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        AgreementFactory $agreementFactory = null
+    ) {
+        $this->agreementFactory = $agreementFactory ?:
+                ObjectManager::getInstance()->get(AgreementFactory::class);
+        parent::__construct($context, $coreRegistry);
+    }
     /**
      * @return void
      */
     public function execute()
     {
         $postData = $this->getRequest()->getPostValue();
         if ($postData) {
-            $model = $this->_agreementFactory->create();
+            $model = $this->agreementFactory->create();
             $model->setData($postData);
 
             try {
-                $validationResult = $model->validateData(new \Magento\Framework\DataObject($postData));
+                $validationResult = $model->validateData(new DataObject($postData));
                 if ($validationResult !== true) {
                     foreach ($validationResult as $message) {
                         $this->messageManager->addError($message);
@@ -30,7 +58,7 @@ public function execute()
                     $this->_redirect('checkout/*/');
                     return;
                 }
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            } catch (LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addError(__('Something went wrong while saving this condition.'));