From f2fe165ccb7946f2d39b0d8b3634d858852bb0a1 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 6 Dec 2017 15:51:19 +0100 Subject: [PATCH] Drop useless CompatUtility::GetCustomAttributeConfig() wrapper --- lib/db_ido/dbobject.cpp | 4 ++-- lib/icinga/compatutility.cpp | 11 ----------- lib/icinga/compatutility.hpp | 3 --- lib/livestatus/commandstable.cpp | 6 +++--- lib/livestatus/contactstable.cpp | 8 ++++---- lib/livestatus/hoststable.cpp | 8 ++++---- lib/livestatus/servicestable.cpp | 8 ++++---- 7 files changed, 17 insertions(+), 31 deletions(-) diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp index 7a7fa92ae..b9c14d528 100644 --- a/lib/db_ido/dbobject.cpp +++ b/lib/db_ido/dbobject.cpp @@ -227,7 +227,7 @@ void DbObject::SendVarsConfigUpdateHeavy() query2.WhereCriteria->Set("object_id", obj); queries.emplace_back(std::move(query2)); - Dictionary::Ptr vars = CompatUtility::GetCustomAttributeConfig(custom_var_object); + Dictionary::Ptr vars = custom_var_object->GetVars(); if (vars) { ObjectLock olock (vars); @@ -274,7 +274,7 @@ void DbObject::SendVarsStatusUpdate() if (!custom_var_object) return; - Dictionary::Ptr vars = CompatUtility::GetCustomAttributeConfig(custom_var_object); + Dictionary::Ptr vars = custom_var_object->GetVars(); if (vars) { std::vector queries; diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp index 3ab26a187..ba7d566ea 100644 --- a/lib/icinga/compatutility.cpp +++ b/lib/icinga/compatutility.cpp @@ -233,17 +233,6 @@ int CompatUtility::GetCheckableInNotificationPeriod(const Checkable::Ptr& checka return 0; } -/* vars attr */ -Dictionary::Ptr CompatUtility::GetCustomAttributeConfig(const CustomVarObject::Ptr& object) -{ - Dictionary::Ptr vars = object->GetVars(); - - if (!vars) - return nullptr; - - return vars; -} - /* notifications */ int CompatUtility::GetCheckableNotificationLastNotification(const Checkable::Ptr& checkable) { diff --git a/lib/icinga/compatutility.hpp b/lib/icinga/compatutility.hpp index e5c6af536..25f827fec 100644 --- a/lib/icinga/compatutility.hpp +++ b/lib/icinga/compatutility.hpp @@ -78,9 +78,6 @@ public: static std::set GetCheckableNotificationUsers(const Checkable::Ptr& checkable); static std::set GetCheckableNotificationUserGroups(const Checkable::Ptr& checkable); - /* custom attribute */ - static Dictionary::Ptr GetCustomAttributeConfig(const CustomVarObject::Ptr& object); - /* check result */ static String GetCheckResultOutput(const CheckResult::Ptr& cr); static String GetCheckResultLongOutput(const CheckResult::Ptr& cr); diff --git a/lib/livestatus/commandstable.cpp b/lib/livestatus/commandstable.cpp index 6526486b1..8aa5f0998 100644 --- a/lib/livestatus/commandstable.cpp +++ b/lib/livestatus/commandstable.cpp @@ -103,7 +103,7 @@ Value CommandsTable::CustomVariableNamesAccessor(const Value& row) { ObjectLock olock(command); - vars = CompatUtility::GetCustomAttributeConfig(command); + vars = command->GetVars(); } Array::Ptr cv = new Array(); @@ -132,7 +132,7 @@ Value CommandsTable::CustomVariableValuesAccessor(const Value& row) { ObjectLock olock(command); - vars = CompatUtility::GetCustomAttributeConfig(command); + vars = command->GetVars(); } Array::Ptr cv = new Array(); @@ -161,7 +161,7 @@ Value CommandsTable::CustomVariablesAccessor(const Value& row) { ObjectLock olock(command); - vars = CompatUtility::GetCustomAttributeConfig(command); + vars = command->GetVars(); } Array::Ptr cv = new Array(); diff --git a/lib/livestatus/contactstable.cpp b/lib/livestatus/contactstable.cpp index fe725bc3c..54a613adc 100644 --- a/lib/livestatus/contactstable.cpp +++ b/lib/livestatus/contactstable.cpp @@ -207,7 +207,7 @@ Value ContactsTable::CustomVariableNamesAccessor(const Value& row) { ObjectLock olock(user); - vars = CompatUtility::GetCustomAttributeConfig(user); + vars = user->GetVars(); } Array::Ptr cv = new Array(); @@ -234,7 +234,7 @@ Value ContactsTable::CustomVariableValuesAccessor(const Value& row) { ObjectLock olock(user); - vars = CompatUtility::GetCustomAttributeConfig(user); + vars = user->GetVars(); } Array::Ptr cv = new Array(); @@ -264,7 +264,7 @@ Value ContactsTable::CustomVariablesAccessor(const Value& row) { ObjectLock olock(user); - vars = CompatUtility::GetCustomAttributeConfig(user); + vars = user->GetVars(); } Array::Ptr cv = new Array(); @@ -299,7 +299,7 @@ Value ContactsTable::CVIsJsonAccessor(const Value& row) { ObjectLock olock(user); - vars = CompatUtility::GetCustomAttributeConfig(user); + vars = user->GetVars(); } if (!vars) diff --git a/lib/livestatus/hoststable.cpp b/lib/livestatus/hoststable.cpp index 6c0157f1b..5cbaf986c 100644 --- a/lib/livestatus/hoststable.cpp +++ b/lib/livestatus/hoststable.cpp @@ -1021,7 +1021,7 @@ Value HostsTable::CustomVariableNamesAccessor(const Value& row) { ObjectLock olock(host); - vars = CompatUtility::GetCustomAttributeConfig(host); + vars = host->GetVars(); } Array::Ptr cv = new Array(); @@ -1048,7 +1048,7 @@ Value HostsTable::CustomVariableValuesAccessor(const Value& row) { ObjectLock olock(host); - vars = CompatUtility::GetCustomAttributeConfig(host); + vars = host->GetVars(); } Array::Ptr cv = new Array(); @@ -1078,7 +1078,7 @@ Value HostsTable::CustomVariablesAccessor(const Value& row) { ObjectLock olock(host); - vars = CompatUtility::GetCustomAttributeConfig(host); + vars = host->GetVars(); } Array::Ptr cv = new Array(); @@ -1113,7 +1113,7 @@ Value HostsTable::CVIsJsonAccessor(const Value& row) { ObjectLock olock(host); - vars = CompatUtility::GetCustomAttributeConfig(host); + vars = host->GetVars(); } if (!vars) diff --git a/lib/livestatus/servicestable.cpp b/lib/livestatus/servicestable.cpp index d88c3a906..492317328 100644 --- a/lib/livestatus/servicestable.cpp +++ b/lib/livestatus/servicestable.cpp @@ -1043,7 +1043,7 @@ Value ServicesTable::CustomVariableNamesAccessor(const Value& row) { ObjectLock olock(service); - vars = CompatUtility::GetCustomAttributeConfig(service); + vars = service->GetVars(); } Array::Ptr cv = new Array(); @@ -1070,7 +1070,7 @@ Value ServicesTable::CustomVariableValuesAccessor(const Value& row) { ObjectLock olock(service); - vars = CompatUtility::GetCustomAttributeConfig(service); + vars = service->GetVars(); } Array::Ptr cv = new Array(); @@ -1100,7 +1100,7 @@ Value ServicesTable::CustomVariablesAccessor(const Value& row) { ObjectLock olock(service); - vars = CompatUtility::GetCustomAttributeConfig(service); + vars = service->GetVars(); } Array::Ptr cv = new Array(); @@ -1135,7 +1135,7 @@ Value ServicesTable::CVIsJsonAccessor(const Value& row) { ObjectLock olock(service); - vars = CompatUtility::GetCustomAttributeConfig(service); + vars = service->GetVars(); } if (!vars)