Renamed JsonVariant::invalid<T>() to JsonVariant::defaultValue<T>()

bblanchon · May 18, 2016 · 9b3e3a3 · 9b3e3a3
1 parent a3a2ca4
commit 9b3e3a3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ HEAD
 ----
 
 * Added `JsonVariant::success()` (issue #279)
+* Renamed `JsonVariant::invalid<T>()` to `JsonVariant::defaultValue<T>()`
 
 v5.4.0
 ------

diff --git a/include/ArduinoJson/JsonArray.ipp b/include/ArduinoJson/JsonArray.ipp
@@ -55,7 +55,7 @@ inline JsonVariant JsonArray::get(size_t index) const {
 template <typename T>
 inline T JsonArray::get(size_t index) const {
   node_type *node = getNodeAt(index);
-  return node ? node->content.as<T>() : JsonVariant::invalid<T>();
+  return node ? node->content.as<T>() : JsonVariant::defaultValue<T>();
 }
 
 template <typename T>
@@ -71,12 +71,12 @@ inline const JsonArraySubscript JsonVariantBase<TImplem>::operator[](
 }
 
 template <>
-inline JsonArray &JsonVariant::invalid<JsonArray &>() {
+inline JsonArray &JsonVariant::defaultValue<JsonArray &>() {
   return JsonArray::invalid();
 }
 
 template <>
-inline JsonArray const &JsonVariant::invalid<JsonArray const &>() {
+inline JsonArray const &JsonVariant::defaultValue<JsonArray const &>() {
   return JsonArray::invalid();
 }
 

diff --git a/include/ArduinoJson/JsonObject.ipp b/include/ArduinoJson/JsonObject.ipp
@@ -21,7 +21,7 @@ inline JsonVariant JsonObject::get(JsonObjectKey key) const {
 template <typename T>
 inline T JsonObject::get(JsonObjectKey key) const {
   node_type *node = getNodeAt(key.c_str());
-  return node ? node->content.value.as<T>() : JsonVariant::invalid<T>();
+  return node ? node->content.value.as<T>() : JsonVariant::defaultValue<T>();
 }
 
 template <typename T>
@@ -57,8 +57,7 @@ inline bool JsonObject::setNodeAt(JsonObjectKey key, T value) {
   node_type *node = getNodeAt(key.c_str());
   if (!node) {
     node = addNewNode();
-    if (!node || !setNodeKey(node, key))
-      return false;
+    if (!node || !setNodeKey(node, key)) return false;
   }
   return setNodeValue<T>(node, value);
 }
@@ -104,12 +103,12 @@ operator[](const String &key) const {
 }
 
 template <>
-inline JsonObject const &JsonVariant::invalid<JsonObject const &>() {
+inline JsonObject const &JsonVariant::defaultValue<JsonObject const &>() {
   return JsonObject::invalid();
 }
 
 template <>
-inline JsonObject &JsonVariant::invalid<JsonObject &>() {
+inline JsonObject &JsonVariant::defaultValue<JsonObject &>() {
   return JsonObject::invalid();
 }
 

diff --git a/include/ArduinoJson/JsonVariant.hpp b/include/ArduinoJson/JsonVariant.hpp
@@ -256,14 +256,17 @@ class JsonVariant : public JsonVariantBase<JsonVariant> {
     return isObject();
   }
 
+  // Returns true if the variant has a value
   bool success() const { return _type != Internals::JSON_UNDEFINED; }
 
   // Serialize the variant to a JsonWriter
   void writeTo(Internals::JsonWriter &writer) const;
 
-  // TODO: rename
+  // Value returned if the variant has an incompatible type
   template <typename T>
-  static T invalid();
+  static T defaultValue() {
+    return T();
+  }
 
   const char *asString() const;
   JsonArray &asArray() const;

diff --git a/include/ArduinoJson/JsonVariant.ipp b/include/ArduinoJson/JsonVariant.ipp
@@ -41,11 +41,6 @@ inline JsonVariant::JsonVariant(JsonObject &object) {
   _content.asObject = &object;
 }
 
-template <typename T>
-inline T JsonVariant::invalid() {
-  return T();
-}
-
 inline Internals::JsonInteger JsonVariant::asInteger() const {
   using namespace Internals;
   switch (_type) {