From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 31 Jan 2019 20:30:46 +0000 (+0100)
Subject: [#429,!217] Dropped "Signed" in StampedValue::getSignedInteger
X-Git-Tag: 429-Updated-StampedValue-to-support-reals_base~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd745c507ce5a888461df1489311de0c22cd312;p=thirdparty%2Fkea.git

[#429,!217] Dropped "Signed" in StampedValue::getSignedInteger
---

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 18871ffea8..6d6351b860 100644
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -766,7 +766,7 @@ bool handleExplicitGlobal(SrvConfigPtr external_cfg, const data::StampedValuePtr
     try {
         const std::string& name = cb_global->getName();
         if (name == "decline-probation-period") {
-            external_cfg->setDeclinePeriod(cb_global->getSignedIntegerValue());
+            external_cfg->setDeclinePeriod(cb_global->getIntegerValue());
         }
         else if (name == "echo-client-id") {
             external_cfg->setEchoClientId(cb_global->getValue() == "true" ? true : false);
diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
index 3e2615d805..909a97338c 100644
--- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
+++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
@@ -508,7 +508,7 @@ TEST_F(MySqlConfigBackendDHCPv4Test, getAllGlobalParameters4) {
 
     // Verify their values.
     EXPECT_EQ("value1", (*parameters_index.find("name1"))->getValue());
-    EXPECT_EQ(65, (*parameters_index.find("name2"))->getSignedIntegerValue());
+    EXPECT_EQ(65, (*parameters_index.find("name2"))->getIntegerValue());
     EXPECT_EQ("value3", (*parameters_index.find("name3"))->getValue());
     EXPECT_TRUE((*parameters_index.find("name4"))->getBoolValue());
     EXPECT_EQ(1.65, (*parameters_index.find("name5"))->getDoubleValue());
diff --git a/src/lib/cc/stamped_value.cc b/src/lib/cc/stamped_value.cc
index 99a15077a6..4371624430 100644
--- a/src/lib/cc/stamped_value.cc
+++ b/src/lib/cc/stamped_value.cc
@@ -129,7 +129,7 @@ StampedValue::getValue() const {
 }
 
 int64_t
-StampedValue::getSignedIntegerValue() const {
+StampedValue::getIntegerValue() const {
     validateAccess(Element::integer);
     return (value_->intValue());
 }
diff --git a/src/lib/cc/stamped_value.h b/src/lib/cc/stamped_value.h
index f36d8dde2a..71b1e05f31 100644
--- a/src/lib/cc/stamped_value.h
+++ b/src/lib/cc/stamped_value.h
@@ -141,7 +141,7 @@ public:
     /// @return Stored value as a signed integer.
     /// @throw TypeError if the value is not of @c Element::integer
     /// type.
-    int64_t getSignedIntegerValue() const;
+    int64_t getIntegerValue() const;
 
     /// @brief Returns value as a boolean.
     ///
diff --git a/src/lib/cc/tests/stamped_value_unittest.cc b/src/lib/cc/tests/stamped_value_unittest.cc
index 6e052e7b28..c622754437 100644
--- a/src/lib/cc/tests/stamped_value_unittest.cc
+++ b/src/lib/cc/tests/stamped_value_unittest.cc
@@ -25,7 +25,7 @@ TEST(StampedValueTest, createNull) {
 
     EXPECT_THROW(value->getType(), InvalidOperation);
     EXPECT_THROW(value->getValue(), InvalidOperation);
-    EXPECT_THROW(value->getSignedIntegerValue(), InvalidOperation);
+    EXPECT_THROW(value->getIntegerValue(), InvalidOperation);
     EXPECT_THROW(value->getBoolValue(), InvalidOperation);
     EXPECT_THROW(value->getDoubleValue(), InvalidOperation);
 }
@@ -39,7 +39,7 @@ TEST(StampedValueTest, createFromString) {
     EXPECT_EQ("bar", value->getName());
     EXPECT_EQ("foo", value->getValue());
 
-    EXPECT_THROW(value->getSignedIntegerValue(), TypeError);
+    EXPECT_THROW(value->getIntegerValue(), TypeError);
     EXPECT_THROW(value->getBoolValue(), TypeError);
     EXPECT_THROW(value->getDoubleValue(), TypeError);
 }
@@ -64,7 +64,7 @@ TEST(StampedValueTest, createFromInteger) {
     EXPECT_EQ("bar", value->getName());
     EXPECT_EQ("5", value->getValue());
     int64_t signed_integer;
-    ASSERT_NO_THROW(signed_integer = value->getSignedIntegerValue());
+    ASSERT_NO_THROW(signed_integer = value->getIntegerValue());
     EXPECT_EQ(5, signed_integer);
 
     EXPECT_THROW(value->getBoolValue(), TypeError);
@@ -78,7 +78,7 @@ TEST(StampedValueTest, convertStringToInteger) {
     EXPECT_FALSE(value->amNull());
     EXPECT_EQ(Element::integer, value->getType());
     EXPECT_EQ("bar", value->getName());
-    EXPECT_EQ(123, value->getSignedIntegerValue());
+    EXPECT_EQ(123, value->getIntegerValue());
 
     EXPECT_THROW(StampedValue::create("bar", "hoho", Element::integer), BadValue);
 }
@@ -95,7 +95,7 @@ TEST(StampedValueTest, createFromBool) {
     ASSERT_NO_THROW(bool_value = value->getBoolValue());
     EXPECT_TRUE(bool_value);
 
-    EXPECT_THROW(value->getSignedIntegerValue(), TypeError);
+    EXPECT_THROW(value->getIntegerValue(), TypeError);
     EXPECT_THROW(value->getDoubleValue(), TypeError);
 }
 
@@ -129,7 +129,7 @@ TEST(StampedValueTest, createFromDouble) {
     ASSERT_NO_THROW(double_value = value->getDoubleValue());
     EXPECT_EQ(1.45, double_value);
 
-    EXPECT_THROW(value->getSignedIntegerValue(), TypeError);
+    EXPECT_THROW(value->getIntegerValue(), TypeError);
     EXPECT_THROW(value->getBoolValue(), TypeError);
 }