From ce3bbde2890f702247f4a018893b219183ac8bbd Mon Sep 17 00:00:00 2001
From: Ravi Kumar Kempapura Srinivasa <ravi.srinivasa@icinga.com>
Date: Mon, 4 May 2020 11:22:47 +0200
Subject: [PATCH] Apply public static getRestriction and
 applyMonitoringRestriction changes

Apply the public static getRestriction and applyMonitoringRestriction changes in the places were the corresponding methods are used.
---
 library/Businessprocess/Common/EnumList.php     | 7 ++++---
 library/Businessprocess/IcingaDbBackend.php     | 4 ++--
 library/Businessprocess/State/IcingaDbState.php | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/library/Businessprocess/Common/EnumList.php b/library/Businessprocess/Common/EnumList.php
index 3520793..b1446fb 100644
--- a/library/Businessprocess/Common/EnumList.php
+++ b/library/Businessprocess/Common/EnumList.php
@@ -3,6 +3,7 @@
 namespace Icinga\Module\Businessprocess\Common;
 
 use Icinga\Module\Businessprocess\IcingaDbBackend;
+use Icinga\Module\Businessprocess\MonitoringRestrictions;
 
 trait EnumList
 {
@@ -14,7 +15,7 @@ trait EnumList
             $names = $this->backend
                 ->select()
                 ->from('hostStatus', ['hostname' => 'host_name'])
-                ->applyFilter($this->getRestriction('monitoring/filter/objects'))
+                ->applyFilter(MonitoringRestrictions::getRestriction('monitoring/filter/objects'))
                 ->order('host_name')
                 ->getQuery()
                 ->fetchColumn();
@@ -38,7 +39,7 @@ trait EnumList
             $names = $this->backend
                 ->select()
                 ->from('hostStatus', ['hostname' => 'host_name'])
-                ->applyFilter($this->getRestriction('monitoring/filter/objects'))
+                ->applyFilter(MonitoringRestrictions::getRestriction('monitoring/filter/objects'))
                 ->order('host_name')
                 ->getQuery()
                 ->fetchColumn();
@@ -64,7 +65,7 @@ trait EnumList
                 ->select()
                 ->from('serviceStatus', ['service' => 'service_description'])
                 ->where('host_name', $host)
-                ->applyFilter($this->getRestriction('monitoring/filter/objects'))
+                ->applyFilter(MonitoringRestrictions::getRestriction('monitoring/filter/objects'))
                 ->order('service_description')
                 ->getQuery()
                 ->fetchColumn();
diff --git a/library/Businessprocess/IcingaDbBackend.php b/library/Businessprocess/IcingaDbBackend.php
index 625127f..9dee1e0 100644
--- a/library/Businessprocess/IcingaDbBackend.php
+++ b/library/Businessprocess/IcingaDbBackend.php
@@ -29,7 +29,7 @@ class IcingaDbBackend
         $hosts = Host::on($this->conn)
             ->orderBy('host.name');
 
-        $this->applyMonitoringRestriction($hosts);
+        self::applyMonitoringRestriction($hosts);
 
         return $hosts;
     }
@@ -43,7 +43,7 @@ class IcingaDbBackend
             ->where(['service_host.name = ?' => $host])
             ->orderBy('service.name');
 
-        $this->applyMonitoringRestriction($services);
+        self::applyMonitoringRestriction($services);
 
         return $services;
     }
diff --git a/library/Businessprocess/State/IcingaDbState.php b/library/Businessprocess/State/IcingaDbState.php
index 56b1a70..1a14df4 100644
--- a/library/Businessprocess/State/IcingaDbState.php
+++ b/library/Businessprocess/State/IcingaDbState.php
@@ -65,7 +65,7 @@ class IcingaDbState extends IcingaDbBackend
         $queryHost->getSelectBase()
             ->where(['host.name IN (?)' => $hosts]);
 
-        $this->applyMonitoringRestriction($queryHost);
+        IcingaDbBackend::applyMonitoringRestriction($queryHost);
 
         if ($this->config->usesHardStates()) {
             $stateCol = 'state.hard_state';
@@ -96,7 +96,7 @@ class IcingaDbState extends IcingaDbBackend
         $queryService->getSelectBase()
             ->where(['service_host.name IN (?)' => $hosts]);
 
-        $this->applyMonitoringRestriction($queryService);
+        IcingaDbBackend::applyMonitoringRestriction($queryService);
 
         $serviceStatusCols = array(
             'hostname'          => 'host.name',