From 019e8326b75c310f9b3c265e72eb4504f3642b84 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Mon, 25 Nov 2024 11:13:39 +0100
Subject: [PATCH] Implement `JsonString` from `RamString`

---
 .../Strings/Adapters/JsonString.hpp           |  4 +--
 src/ArduinoJson/Strings/JsonString.hpp        | 32 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/ArduinoJson/Strings/Adapters/JsonString.hpp b/src/ArduinoJson/Strings/Adapters/JsonString.hpp
index 1344e881..ae7e3573 100644
--- a/src/ArduinoJson/Strings/Adapters/JsonString.hpp
+++ b/src/ArduinoJson/Strings/Adapters/JsonString.hpp
@@ -14,8 +14,8 @@ template <>
 struct StringAdapter<JsonString> {
   using AdaptedString = RamString;
 
-  static AdaptedString adapt(const JsonString& s) {
-    return AdaptedString(s.c_str(), s.size(), s.isLinked());
+  static const AdaptedString& adapt(const JsonString& s) {
+    return s.str_;
   }
 };
 
diff --git a/src/ArduinoJson/Strings/JsonString.hpp b/src/ArduinoJson/Strings/JsonString.hpp
index 2ecb697b..133067f0 100644
--- a/src/ArduinoJson/Strings/JsonString.hpp
+++ b/src/ArduinoJson/Strings/JsonString.hpp
@@ -13,54 +13,56 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 // A string.
 // https://arduinojson.org/v7/api/jsonstring/
 class JsonString {
+  friend struct detail::StringAdapter<JsonString>;
+
  public:
   enum Ownership { Copied, Linked };
 
-  JsonString() : data_(0), size_(0), ownership_(Linked) {}
+  JsonString() : str_(nullptr, 0, true) {}
 
   JsonString(const char* data, Ownership ownership = Linked)
-      : data_(data), size_(data ? ::strlen(data) : 0), ownership_(ownership) {}
+      : str_(data, data ? ::strlen(data) : 0, ownership == Linked) {}
 
   JsonString(const char* data, size_t sz, Ownership ownership = Linked)
-      : data_(data), size_(sz), ownership_(ownership) {}
+      : str_(data, sz, ownership == Linked) {}
 
   // Returns a pointer to the characters.
   const char* c_str() const {
-    return data_;
+    return str_.data();
   }
 
   // Returns true if the string is null.
   bool isNull() const {
-    return !data_;
+    return str_.isNull();
   }
 
   // Returns true if the string is stored by address.
   // Returns false if the string is stored by copy.
   bool isLinked() const {
-    return ownership_ == Linked;
+    return str_.isLinked();
   }
 
   // Returns length of the string.
   size_t size() const {
-    return size_;
+    return str_.size();
   }
 
   // Returns true if the string is non-null
   explicit operator bool() const {
-    return data_ != 0;
+    return str_.data() != 0;
   }
 
   // Returns true if strings are equal.
   friend bool operator==(JsonString lhs, JsonString rhs) {
-    if (lhs.size_ != rhs.size_)
+    if (lhs.size() != rhs.size())
       return false;
-    if (lhs.data_ == rhs.data_)
+    if (lhs.c_str() == rhs.c_str())
       return true;
-    if (!lhs.data_)
+    if (!lhs.c_str())
       return false;
-    if (!rhs.data_)
+    if (!rhs.c_str())
       return false;
-    return memcmp(lhs.data_, rhs.data_, lhs.size_) == 0;
+    return memcmp(lhs.c_str(), rhs.c_str(), lhs.size()) == 0;
   }
 
   // Returns true if strings differs.
@@ -76,9 +78,7 @@ class JsonString {
 #endif
 
  private:
-  const char* data_;
-  size_t size_;
-  Ownership ownership_;
+  detail::RamString str_;
 };
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE