Remove more redundant wrappers from CompatUtility class

[icinga2] / lib / livestatus / commandstable.cpp

diff --git a/lib/livestatus/commandstable.cpp b/lib/livestatus/commandstable.cpp
index b36a8bd0d3d59b80209cbe4682b50aac9f80bfcd..6526486b1cced670a7fccc16e024c80e3734aa18 100644 (file)
--- a/lib/livestatus/commandstable.cpp
+++ b/lib/livestatus/commandstable.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2015 Icinga Development Team (http://www.icinga.org)    *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -23,51 +23,55 @@
 #include "icinga/eventcommand.hpp"
 #include "icinga/notificationcommand.hpp"
 #include "icinga/compatutility.hpp"
-#include "base/dynamictype.hpp"
+#include "base/configtype.hpp"
 #include "base/objectlock.hpp"
 #include "base/convert.hpp"
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>
 
 using namespace icinga;
 
-CommandsTable::CommandsTable(void)
+CommandsTable::CommandsTable()
 {
        AddColumns(this);
 }
 
 void CommandsTable::AddColumns(Table *table, const String& prefix,
-    const Column::ObjectAccessor& objectAccessor)
+       const Column::ObjectAccessor& objectAccessor)
 {
        table->AddColumn(prefix + "name", Column(&CommandsTable::NameAccessor, objectAccessor));
        table->AddColumn(prefix + "line", Column(&CommandsTable::LineAccessor, objectAccessor));
        table->AddColumn(prefix + "custom_variable_names", Column(&CommandsTable::CustomVariableNamesAccessor, objectAccessor));
        table->AddColumn(prefix + "custom_variable_values", Column(&CommandsTable::CustomVariableValuesAccessor, objectAccessor));
        table->AddColumn(prefix + "custom_variables", Column(&CommandsTable::CustomVariablesAccessor, objectAccessor));
-       table->AddColumn(prefix + "modified_attributes", Column(&CommandsTable::ModifiedAttributesAccessor, objectAccessor));
-       table->AddColumn(prefix + "modified_attributes_list", Column(&CommandsTable::ModifiedAttributesListAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes", Column(&Table::ZeroAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes_list", Column(&Table::ZeroAccessor, objectAccessor));
 }
 
-String CommandsTable::GetName(void) const
+String CommandsTable::GetName() const
 {
        return "commands";
 }
 
-String CommandsTable::GetPrefix(void) const
+String CommandsTable::GetPrefix() const
 {
        return "command";
 }
 
 void CommandsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-       BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjectsByType<CheckCommand>()) {
-               addRowFn(object, LivestatusGroupByNone, Empty);
+       for (const ConfigObject::Ptr& object : ConfigType::GetObjectsByType<CheckCommand>()) {
+               if (!addRowFn(object, LivestatusGroupByNone, Empty))
+                       return;
        }
-       BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjectsByType<EventCommand>()) {
-               addRowFn(object, LivestatusGroupByNone, Empty);
+
+       for (const ConfigObject::Ptr& object : ConfigType::GetObjectsByType<EventCommand>()) {
+               if (!addRowFn(object, LivestatusGroupByNone, Empty))
+                       return;
        }
-       BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjectsByType<NotificationCommand>()) {
-               addRowFn(object, LivestatusGroupByNone, Empty);
+
+       for (const ConfigObject::Ptr& object : ConfigType::GetObjectsByType<NotificationCommand>()) {
+               if (!addRowFn(object, LivestatusGroupByNone, Empty))
+                       return;
        }
 }
 
@@ -102,17 +106,16 @@ Value CommandsTable::CustomVariableNamesAccessor(const Value& row)
                vars = CompatUtility::GetCustomAttributeConfig(command);
        }
 
-       if (!vars)
-               return Empty;
-
        Array::Ptr cv = new Array();
 
-       String key;
-       Value value;
+       if (!vars)
+               return cv;
 
-       ObjectLock xlock(vars);
-       BOOST_FOREACH(tie(key, value), vars) {
-               cv->Add(key);
+       {
+               ObjectLock xlock(vars);
+               for (const auto& kv : vars) {
+                       cv->Add(kv.first);
+               }
        }
 
        return cv;
@@ -132,17 +135,16 @@ Value CommandsTable::CustomVariableValuesAccessor(const Value& row)
                vars = CompatUtility::GetCustomAttributeConfig(command);
        }
 
-       if (!vars)
-               return Empty;
-
        Array::Ptr cv = new Array();
 
-       String key;
-       Value value;
+       if (!vars)
+               return cv;
 
-       ObjectLock xlock(vars);
-       BOOST_FOREACH(tie(key, value), vars) {
-               cv->Add(value);
+       {
+               ObjectLock xlock(vars);
+               for (const auto& kv : vars) {
+                       cv->Add(kv.second);
+               }
        }
 
        return cv;
@@ -162,42 +164,20 @@ Value CommandsTable::CustomVariablesAccessor(const Value& row)
                vars = CompatUtility::GetCustomAttributeConfig(command);
        }
 
-       if (!vars)
-               return Empty;
-
        Array::Ptr cv = new Array();
 
-       String key;
-       Value value;
+       if (!vars)
+               return cv;
 
-       ObjectLock xlock(vars);
-       BOOST_FOREACH(tie(key, value), vars) {
-               Array::Ptr key_val = new Array();
-               key_val->Add(key);
-               key_val->Add(value);
-               cv->Add(key_val);
+       {
+               ObjectLock xlock(vars);
+               for (const auto& kv : vars) {
+                       Array::Ptr key_val = new Array();
+                       key_val->Add(kv.first);
+                       key_val->Add(kv.second);
+                       cv->Add(key_val);
+               }
        }
 
        return cv;
 }
-
-Value CommandsTable::ModifiedAttributesAccessor(const Value& row)
-{
-       Command::Ptr command = static_cast<Command::Ptr>(row);
-
-       if (!command)
-               return Empty;
-
-       /* not supported */
-       return command->GetModifiedAttributes();
-}
-
-Value CommandsTable::ModifiedAttributesListAccessor(const Value& row)
-{
-       Command::Ptr command = static_cast<Command::Ptr>(row);
-
-       if (!command)
-               return Empty;
-
-       return CompatUtility::GetModifiedAttributesList(command);
-}