From a3010269c98ed02613e03c33f0ac69437f9e9d27 Mon Sep 17 00:00:00 2001
From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 16 Jun 2015 16:34:16 +0200
Subject: [PATCH] [3880] Changes after review:

 - StatsMgr::getStatName() implemented.
---
 src/lib/stats/stats_mgr.cc | 76 +++++++++++++++++++-------------------
 src/lib/stats/stats_mgr.h  | 16 ++++++++
 2 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/src/lib/stats/stats_mgr.cc b/src/lib/stats/stats_mgr.cc
index ec879dbdc7..f495b3f001 100644
--- a/src/lib/stats/stats_mgr.cc
+++ b/src/lib/stats/stats_mgr.cc
@@ -149,67 +149,44 @@ size_t StatsMgr::count() const {
 isc::data::ConstElementPtr
 StatsMgr::statisticGetHandler(const std::string& /*name*/,
                               const isc::data::ConstElementPtr& params) {
-    if (!params) {
-        return (createAnswer(CONTROL_RESULT_ERROR,
-                             "Missing mandatory 'name' parameter."));
-    }
-    ConstElementPtr stat_name = params->get("name");
-    if (!stat_name) {
-        return (createAnswer(CONTROL_RESULT_ERROR,
-                             "Missing mandatory 'name' parameter."));
-    }
-    if (stat_name->getType() != Element::string) {
-        return (createAnswer(CONTROL_RESULT_ERROR,
-                             "'name' parameter expected to be a string."));
+    std::string name, error;
+    if (!getStatName(params, name, error)) {
+        return (createAnswer(CONTROL_RESULT_ERROR, error));
     }
     return (createAnswer(CONTROL_RESULT_SUCCESS,
-                         instance().get(stat_name->stringValue())));
+                         instance().get(name)));
 }
 
 isc::data::ConstElementPtr
 StatsMgr::statisticResetHandler(const std::string& /*name*/,
                                 const isc::data::ConstElementPtr& params) {
-    if (!params) {
-        return (createAnswer(CONTROL_RESULT_ERROR,
-                             "Missing mandatory 'name' parameter."));
-    }
-    ConstElementPtr stat_name = params->get("name");
-    if (!stat_name) {
-        return (createAnswer(CONTROL_RESULT_ERROR,
-                             "Missing mandatory 'name' parameter."));
-    }
-    if (stat_name->getType() != Element::string) {
-        return (createAnswer(CONTROL_RESULT_ERROR,
-                             "'name' parameter expected to be a string."));
+    std::string name, error;
+    if (!getStatName(params, name, error)) {
+        return (createAnswer(CONTROL_RESULT_ERROR, error));
     }
 
-    if (instance().reset(stat_name->stringValue())) {
+    if (instance().reset(name)) {
         return (createAnswer(CONTROL_RESULT_SUCCESS,
-                             "Statistic '" + stat_name->stringValue() + "' reset."));
+                             "Statistic '" + name + "' reset."));
     } else {
         return (createAnswer(CONTROL_RESULT_ERROR,
-                             "No '" + stat_name->stringValue() + "' statistic found"));
+                             "No '" + name + "' statistic found"));
     }
 }
 
 isc::data::ConstElementPtr
 StatsMgr::statisticRemoveHandler(const std::string& /*name*/,
                                  const isc::data::ConstElementPtr& params) {
-    if (!params) {
-        return (createAnswer(CONTROL_RESULT_ERROR,
-                             "Missing mandatory 'name' parameter."));
+    std::string name, error;
+    if (!getStatName(params, name, error)) {
+        return (createAnswer(CONTROL_RESULT_ERROR, error));
     }
-    ConstElementPtr stat_name = params->get("name");
-    if (!stat_name) {
-        return (createAnswer(CONTROL_RESULT_ERROR,
-                             "Missing mandatory 'name' parameter."));
-    }
-    if (instance().del(stat_name->stringValue())) {
+    if (instance().del(name)) {
         return (createAnswer(CONTROL_RESULT_SUCCESS,
-                             "Statistic '" + stat_name->stringValue() + "' removed."));
+                             "Statistic '" + name + "' removed."));
     } else {
         return (createAnswer(CONTROL_RESULT_ERROR,
-                             "No '" + stat_name->stringValue() + "' statistic found"));
+                             "No '" + name + "' statistic found"));
     }
 
 }
@@ -237,6 +214,27 @@ StatsMgr::statisticResetAllHandler(const std::string& /*name*/,
                          "All statistics reset to neutral values."));
 }
 
+bool
+StatsMgr::getStatName(const isc::data::ConstElementPtr& params,
+                      std::string& name,
+                      std::string& reason) {
+    if (!params) {
+        reason = "Missing mandatory 'name' parameter.";
+        return (false);
+    }
+    ConstElementPtr stat_name = params->get("name");
+    if (!stat_name) {
+        reason = "Missing mandatory 'name' parameter.";
+        return (false);
+    }
+    if (stat_name->getType() != Element::string) {
+        reason = "'name' parameter expected to be a string.";
+        return (false);
+    }
+
+    name = stat_name->stringValue();
+    return (true);
+}
 
 };
 };
diff --git a/src/lib/stats/stats_mgr.h b/src/lib/stats/stats_mgr.h
index 1e761a6ee9..ebec39f615 100644
--- a/src/lib/stats/stats_mgr.h
+++ b/src/lib/stats/stats_mgr.h
@@ -362,6 +362,22 @@ class StatsMgr : public boost::noncopyable {
     /// @return true if deleted, false if not found
     bool deleteObservation(const std::string& name);
 
+    /// @brief Utility method that attempts to extract statistic name
+    ///
+    /// This method attempts to extract statistic name from the params
+    /// structure. It is expected to be a map that contains 'name' element,
+    /// that is of type string. If present as expected, statistic name
+    /// set and true is returned. If missing or is of incorrect type, the reason
+    /// is specified in reason parameter and false is returned.
+    ///
+    /// @param params parameters structure received in command
+    /// @param name [out] name of the statistic (if no error detected)
+    /// @param reason [out] failure reason (if error is detected)
+    /// @return true (if everything is ok), false otherwise
+    static bool getStatName(const isc::data::ConstElementPtr& params,
+                            std::string& name,
+                            std::string& reason);
+
     // This is a global context. All statistics will initially be stored here.
     StatContextPtr global_;
 };
-- 
2.47.3