Removed StringAdapter::equals()

extras/tests/Cpp17/string_view.cpp

@@ -71,9 +71,5 @@ TEST_CASE("StringViewAdapter") {
   CHECK(adapter.compare("bravo") == 0);
   CHECK(adapter.compare("charlie") < 0);
 
-  CHECK(adapter.equals("bravo"));
-  CHECK_FALSE(adapter.equals("charlie"));
-  CHECK_FALSE(adapter.equals(NULL));
-
   CHECK(adapter.size() == 5);
 }

extras/tests/Misc/StringAdapters.cpp

@@ -22,9 +22,6 @@ TEST_CASE("const char*") {
     CHECK(adapter.compare("bravo") < 0);
     CHECK(adapter.compare(NULL) == 0);
 
-    CHECK(adapter.equals(NULL));
-    CHECK_FALSE(adapter.equals("charlie"));
-
     CHECK(adapter.size() == 0);
   }
 
@@ -36,9 +33,6 @@ TEST_CASE("const char*") {
     CHECK(adapter.compare("bravo") == 0);
     CHECK(adapter.compare("charlie") < 0);
 
-    CHECK(adapter.equals("bravo"));
-    CHECK_FALSE(adapter.equals("charlie"));
-
     CHECK(adapter.size() == 5);
   }
 }
@@ -50,9 +44,6 @@ TEST_CASE("const char* + size") {
     CHECK(adapter.compare("bravo") < 0);
     CHECK(adapter.compare(NULL) == 0);
 
-    CHECK(adapter.equals(NULL));
-    CHECK_FALSE(adapter.equals("charlie"));
-
     CHECK(adapter.size() == 10);
   }
 
@@ -64,9 +55,6 @@ TEST_CASE("const char* + size") {
     CHECK(adapter.compare("bravo") == 0);
     CHECK(adapter.compare("charlie") < 0);
 
-    CHECK(adapter.equals("bravo"));
-    CHECK_FALSE(adapter.equals("charlie"));
-
     CHECK(adapter.size() == 5);
   }
 }
@@ -78,9 +66,6 @@ TEST_CASE("const __FlashStringHelper*") {
     CHECK(adapter.compare("bravo") < 0);
     CHECK(adapter.compare(NULL) == 0);
 
-    CHECK(adapter.equals(NULL));
-    CHECK_FALSE(adapter.equals("charlie"));
-
     CHECK(adapter.size() == 0);
   }
 
@@ -92,9 +77,6 @@ TEST_CASE("const __FlashStringHelper*") {
     CHECK(adapter.compare("bravo") == 0);
     CHECK(adapter.compare("charlie") < 0);
 
-    CHECK(adapter.equals("bravo"));
-    CHECK_FALSE(adapter.equals("charlie"));
-
     CHECK(adapter.size() == 5);
   }
 }
@@ -108,9 +90,6 @@ TEST_CASE("std::string") {
   CHECK(adapter.compare("bravo") == 0);
   CHECK(adapter.compare("charlie") < 0);
 
-  CHECK(adapter.equals("bravo"));
-  CHECK_FALSE(adapter.equals("charlie"));
-
   CHECK(adapter.size() == 5);
 }
 
@@ -123,9 +102,6 @@ TEST_CASE("Arduino String") {
   CHECK(adapter.compare("bravo") == 0);
   CHECK(adapter.compare("charlie") < 0);
 
-  CHECK(adapter.equals("bravo"));
-  CHECK_FALSE(adapter.equals("charlie"));
-
   CHECK(adapter.size() == 5);
 }
 
@@ -138,9 +114,6 @@ TEST_CASE("custom_string") {
   CHECK(adapter.compare("bravo") == 0);
   CHECK(adapter.compare("charlie") < 0);
 
-  CHECK(adapter.equals("bravo"));
-  CHECK_FALSE(adapter.equals("charlie"));
-
   CHECK(adapter.size() == 5);
 }
 

src/ArduinoJson/Collection/CollectionImpl.hpp

@@ -107,7 +107,7 @@ template <typename TAdaptedString>
 inline VariantSlot* CollectionData::getSlot(TAdaptedString key) const {
   VariantSlot* slot = _head;
   while (slot) {
-    if (key.equals(slot->key()))
+    if (key.compare(slot->key()) == 0)
       break;
     slot = slot->next();
   }

src/ArduinoJson/Memory/MemoryPool.hpp

@@ -167,7 +167,7 @@ class MemoryPool {
   template <typename TAdaptedString>
   const char* findString(const TAdaptedString& str) {
     for (char* next = _begin; next < _left; ++next) {
-      if (str.equals(next))
+      if (str.compare(next) == 0)
         return next;
 
       // jump to next terminator

src/ArduinoJson/Strings/Adapters/ArduinoStringAdapter.hpp

@@ -32,10 +32,6 @@ class StringAdapter< ::String> {
     return safe_strcmp(me, other);
   }
 
-  bool equals(const char* expected) const {
-    return compare(expected) == 0;
-  }
-
   size_t size() const {
     return _str->length();
   }

src/ArduinoJson/Strings/Adapters/ConstRamStringAdapter.hpp

@@ -22,10 +22,6 @@ class StringAdapter<const char*> {
     return safe_strcmp(_str, other);
   }
 
-  bool equals(const char* expected) const {
-    return compare(expected) == 0;
-  }
-
   bool isNull() const {
     return !_str;
   }

src/ArduinoJson/Strings/Adapters/FlashStringAdapter.hpp

@@ -25,10 +25,6 @@ class StringAdapter<const __FlashStringHelper*> {
     return -strcmp_P(other, reinterpret_cast<const char*>(_str));
   }
 
-  bool equals(const char* expected) const {
-    return compare(expected) == 0;
-  }
-
   bool isNull() const {
     return !_str;
   }

src/ArduinoJson/Strings/Adapters/SizedFlashStringAdapter.hpp

@@ -26,10 +26,6 @@ class StringAdapter<const __FlashStringHelper*, true> {
     return -strncmp_P(other, reinterpret_cast<const char*>(_str), _size);
   }
 
-  bool equals(const char* expected) const {
-    return compare(expected) == 0;
-  }
-
   bool isNull() const {
     return !_str;
   }

src/ArduinoJson/Strings/Adapters/SizedRamStringAdapter.hpp

@@ -21,10 +21,6 @@ class StringAdapter<TChar*, true> {
     return safe_strncmp(_str, other, _size);
   }
 
-  bool equals(const char* expected) const {
-    return compare(expected) == 0;
-  }
-
   bool isNull() const {
     return !_str;
   }

src/ArduinoJson/Strings/Adapters/StdStringAdapter.hpp

@@ -33,12 +33,6 @@ class StringAdapter<std::basic_string<char, TCharTraits, TAllocator> > {
     return _str->compare(other);
   }
 
-  bool equals(const char* expected) const {
-    if (!expected)
-      return false;
-    return *_str == expected;
-  }
-
   size_t size() const {
     return _str->size();
   }

src/ArduinoJson/Strings/Adapters/StringViewAdapter.hpp

@@ -31,12 +31,6 @@ class StringAdapter<std::string_view> {
     return _str.compare(other);
   }
 
-  bool equals(const char* expected) const {
-    if (!expected)
-      return false;
-    return _str == expected;
-  }
-
   size_t size() const {
     return _str.size();
   }