From 604667ca65fff55b28b397e59fbca6a403dcbf7d Mon Sep 17 00:00:00 2001
From: Sukhwinder Dhillon <sukhwinder33445@gmail.com>
Date: Fri, 17 Nov 2023 12:56:07 +0100
Subject: [PATCH] Relocate Backend classes

---
 .../BackendInterface.php}                           |  4 ++--
 .../Icingadb/IcingadbBackend.php}                   |  5 +++--
 .../Integration/MonitoringModule/Monitoring.php     |  4 ++--
 .../Director/ProvidedHook/Icingadb/HostActions.php  |  4 ++--
 .../ProvidedHook/Icingadb/ServiceActions.php        |  4 ++--
 .../Director/Web/Controller/ActionController.php    | 13 ++++++-------
 6 files changed, 17 insertions(+), 17 deletions(-)
 rename library/Director/{Backend/MonitorBackend.php => Integration/BackendInterface.php} (84%)
 rename library/Director/{Backend/MonitorBackendIcingadb.php => Integration/Icingadb/IcingadbBackend.php} (91%)

diff --git a/library/Director/Backend/MonitorBackend.php b/library/Director/Integration/BackendInterface.php
similarity index 84%
rename from library/Director/Backend/MonitorBackend.php
rename to library/Director/Integration/BackendInterface.php
index 5950d2c0..f8722c1b 100644
--- a/library/Director/Backend/MonitorBackend.php
+++ b/library/Director/Integration/BackendInterface.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Director\Backend;
+namespace Icinga\Module\Director\Integration;
 
 use Icinga\Web\Url;
 
-interface MonitorBackend
+interface BackendInterface
 {
     public function isAvailable(): bool;
 
diff --git a/library/Director/Backend/MonitorBackendIcingadb.php b/library/Director/Integration/Icingadb/IcingadbBackend.php
similarity index 91%
rename from library/Director/Backend/MonitorBackendIcingadb.php
rename to library/Director/Integration/Icingadb/IcingadbBackend.php
index 2305f696..fcdfeacf 100644
--- a/library/Director/Backend/MonitorBackendIcingadb.php
+++ b/library/Director/Integration/Icingadb/IcingadbBackend.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Icinga\Module\Director\Backend;
+namespace Icinga\Module\Director\Integration\Icingadb;
 
 use gipfl\IcingaWeb2\Link;
 use Icinga\Application\Icinga;
 use Icinga\Data\Filter\Filter as DataFilter;
+use Icinga\Module\Director\Integration\BackendInterface;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Common\Database;
@@ -14,7 +15,7 @@ use Icinga\Module\Icingadb\Redis\VolatileStateResults;
 use Icinga\Web\Url;
 use ipl\Stdlib\Filter;
 
-class MonitorBackendIcingadb implements MonitorBackend
+class IcingadbBackend implements BackendInterface
 {
     use Database;
     use Auth;
diff --git a/library/Director/Integration/MonitoringModule/Monitoring.php b/library/Director/Integration/MonitoringModule/Monitoring.php
index 2cda38b1..ccfa60ae 100644
--- a/library/Director/Integration/MonitoringModule/Monitoring.php
+++ b/library/Director/Integration/MonitoringModule/Monitoring.php
@@ -10,11 +10,11 @@ use Icinga\Exception\ConfigurationError;
 use Icinga\Module\Director\Auth\MonitoringRestriction;
 use Icinga\Module\Director\Auth\Permission;
 use Icinga\Module\Director\Auth\Restriction;
-use Icinga\Module\Director\Backend\MonitorBackend;
+use Icinga\Module\Director\Integration\BackendInterface;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 use Icinga\Web\Url;
 
-class Monitoring implements MonitorBackend
+class Monitoring implements BackendInterface
 {
     /** @var ?MonitoringBackend */
     protected $backend;
diff --git a/library/Director/ProvidedHook/Icingadb/HostActions.php b/library/Director/ProvidedHook/Icingadb/HostActions.php
index b3902874..4fa636c0 100644
--- a/library/Director/ProvidedHook/Icingadb/HostActions.php
+++ b/library/Director/ProvidedHook/Icingadb/HostActions.php
@@ -4,8 +4,8 @@ namespace Icinga\Module\Director\ProvidedHook\Icingadb;
 
 use Exception;
 use Icinga\Application\Config;
-use Icinga\Module\Director\Backend\MonitorBackendIcingadb;
 use Icinga\Module\Director\Db;
+use Icinga\Module\Director\Integration\Icingadb\IcingadbBackend;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Icingadb\Hook\HostActionsHook;
@@ -44,7 +44,7 @@ class HostActions extends HostActionsHook
             $allowEdit = true;
         }
         if (Util::hasPermission('director/monitoring/hosts')) {
-            $backend = new MonitorBackendIcingadb();
+            $backend = new IcingadbBackend();
             if ($backend->isAvailable() && $backend->canModifyHost($hostname)) {
                 $allowEdit = IcingaHost::exists($hostname, $db);
             }
diff --git a/library/Director/ProvidedHook/Icingadb/ServiceActions.php b/library/Director/ProvidedHook/Icingadb/ServiceActions.php
index 383d915d..23f3fab9 100644
--- a/library/Director/ProvidedHook/Icingadb/ServiceActions.php
+++ b/library/Director/ProvidedHook/Icingadb/ServiceActions.php
@@ -4,8 +4,8 @@ namespace Icinga\Module\Director\ProvidedHook\Icingadb;
 
 use Exception;
 use Icinga\Application\Config;
-use Icinga\Module\Director\Backend\MonitorBackendIcingadb;
 use Icinga\Module\Director\Db;
+use Icinga\Module\Director\Integration\Icingadb\IcingadbBackend;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Icingadb\Hook\ServiceActionsHook;
@@ -56,7 +56,7 @@ class ServiceActions extends ServiceActionsHook
         if (Util::hasPermission('director/hosts')) {
             $title = mt('director', 'Modify');
         } elseif (Util::hasPermission('director/monitoring/services')) {
-            $backend = new MonitorBackendIcingadb();
+            $backend = new IcingadbBackend();
             if ($backend->isAvailable()
                 && $backend->canModifyService($hostname, $serviceName)
             ) {
diff --git a/library/Director/Web/Controller/ActionController.php b/library/Director/Web/Controller/ActionController.php
index b1aadb96..72750b30 100644
--- a/library/Director/Web/Controller/ActionController.php
+++ b/library/Director/Web/Controller/ActionController.php
@@ -4,13 +4,12 @@ namespace Icinga\Module\Director\Web\Controller;
 
 use gipfl\Translation\StaticTranslator;
 use Icinga\Application\Benchmark;
-use Icinga\Application\Icinga;
 use Icinga\Application\Modules\Module;
 use Icinga\Data\Paginatable;
 use Icinga\Exception\NotFoundError;
 use Icinga\Exception\ProgrammingError;
-use Icinga\Module\Director\Backend\MonitorBackend;
-use Icinga\Module\Director\Backend\MonitorBackendIcingadb;
+use Icinga\Module\Director\Integration\Icingadb\IcingadbBackend;
+use Icinga\Module\Director\Integration\BackendInterface;
 use Icinga\Module\Director\Integration\MonitoringModule\Monitoring;
 use Icinga\Module\Director\Web\Controller\Extension\CoreApi;
 use Icinga\Module\Director\Web\Controller\Extension\DirectorDb;
@@ -40,7 +39,7 @@ abstract class ActionController extends Controller implements ControlsAndContent
     /** @var UrlParams Hint for IDE, somehow does not work in web */
     protected $params;
 
-    /** @var MonitorBackend */
+    /** @var BackendInterface */
     private $backend;
 
     /**
@@ -244,13 +243,13 @@ abstract class ActionController extends Controller implements ControlsAndContent
     }
 
     /**
-     * @return MonitorBackend
+     * @return BackendInterface
      */
-    protected function backend()
+    protected function backend(): BackendInterface
     {
         if ($this->backend === null) {
             if (Module::exists('icingadb')) {
-                $this->backend = new MonitorBackendIcingadb();
+                $this->backend = new IcingadbBackend();
             } else {
                 $this->backend = new Monitoring($this->Auth());
             }