github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 08:42:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove JsonDocument::data() and JsonDocument::memoryPool()

Browse Source
This commit is contained in:
Benoit Blanchon
2022-08-09 10:33:19 +02:00
parent 1d21027e2a
commit 62e83133cd
10 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@ HEAD
* Remove undocumented `accept()` functions * Remove undocumented `accept()` functions
* Rename `addElement()` to `add()` * Rename `addElement()` to `add()`
* Remove `getElement()`, `getOrAddElement()`, `getMember()`, and `getOrAddMember()` * Remove `getElement()`, `getOrAddElement()`, `getMember()`, and `getOrAddMember()`
* Remove `JsonDocument::data()` and `JsonDocument::memoryPool()`
> ### BREAKING CHANGES > ### BREAKING CHANGES
> >

10
extras/tests/MemoryPool/StringCopier.cpp
View File

@@ -12,7 +12,7 @@ TEST_CASE("StringCopier") {
SECTION("Works when buffer is big enough") { SECTION("Works when buffer is big enough") {
MemoryPool pool(buffer, addPadding(JSON_STRING_SIZE(5))); MemoryPool pool(buffer, addPadding(JSON_STRING_SIZE(5)));
StringCopier str(pool); StringCopier str(&pool);
str.startString(); str.startString();
str.append("hello"); str.append("hello");
@@ -24,7 +24,7 @@ TEST_CASE("StringCopier") {
SECTION("Returns null when too small") { SECTION("Returns null when too small") {
MemoryPool pool(buffer, sizeof(void*)); MemoryPool pool(buffer, sizeof(void*));
StringCopier str(pool); StringCopier str(&pool);
str.startString(); str.startString();
str.append("hello world!"); str.append("hello world!");
@@ -35,7 +35,7 @@ TEST_CASE("StringCopier") {
SECTION("Increases size of memory pool") { SECTION("Increases size of memory pool") {
MemoryPool pool(buffer, addPadding(JSON_STRING_SIZE(6))); MemoryPool pool(buffer, addPadding(JSON_STRING_SIZE(6)));
StringCopier str(pool); StringCopier str(&pool);
str.startString(); str.startString();
str.save(); str.save();
@@ -46,7 +46,7 @@ TEST_CASE("StringCopier") {
SECTION("Works when memory pool is 0 bytes") { SECTION("Works when memory pool is 0 bytes") {
MemoryPool pool(buffer, 0); MemoryPool pool(buffer, 0);
StringCopier str(pool); StringCopier str(&pool);
str.startString(); str.startString();
REQUIRE(str.isValid() == false); REQUIRE(str.isValid() == false);
@@ -55,7 +55,7 @@ TEST_CASE("StringCopier") {
} }
static const char* addStringToPool(MemoryPool& pool, const char* s) { static const char* addStringToPool(MemoryPool& pool, const char* s) {
StringCopier str(pool); StringCopier str(&pool);
str.startString(); str.startString();
str.append(s); str.append(s);
return str.save().c_str(); return str.save().c_str();

2
extras/tests/Misc/Utf8.cpp
View File

@@ -12,7 +12,7 @@ using namespace ARDUINOJSON_NAMESPACE;
static void testCodepoint(uint32_t codepoint, std::string expected) { static void testCodepoint(uint32_t codepoint, std::string expected) {
char buffer[4096]; char buffer[4096];
MemoryPool pool(buffer, 4096); MemoryPool pool(buffer, 4096);
StringCopier str(pool); StringCopier str(&pool);
str.startString(); str.startString();
CAPTURE(codepoint); CAPTURE(codepoint);

30
src/ArduinoJson/Deserialization/deserialize.hpp
View File

@@ -14,9 +14,10 @@ namespace ARDUINOJSON_NAMESPACE {
template <template <typename, typename> class TDeserializer, typename TReader, template <template <typename, typename> class TDeserializer, typename TReader,
typename TWriter> typename TWriter>
TDeserializer<TReader, TWriter> makeDeserializer(MemoryPool &pool, TDeserializer<TReader, TWriter> makeDeserializer(MemoryPool *pool,
TReader reader, TReader reader,
TWriter writer) { TWriter writer) {
ARDUINOJSON_ASSERT(pool != 0);
return TDeserializer<TReader, TWriter>(pool, reader, writer); return TDeserializer<TReader, TWriter>(pool, reader, writer);
} }
@@ -31,11 +32,12 @@ typename enable_if<!is_array<TString>::value, DeserializationError>::type
deserialize(JsonDocument &doc, const TString &input, NestingLimit nestingLimit, deserialize(JsonDocument &doc, const TString &input, NestingLimit nestingLimit,
TFilter filter) { TFilter filter) {
Reader<TString> reader(input); Reader<TString> reader(input);
VariantData *data = VariantAttorney::getData(doc);
MemoryPool *pool = VariantAttorney::getPool(doc);
doc.clear(); doc.clear();
return makeDeserializer<TDeserializer>( return makeDeserializer<TDeserializer>(pool, reader,
doc.memoryPool(), reader, makeStringStorage(input, pool))
makeStringStorage(input, doc.memoryPool())) .parse(*data, filter, nestingLimit);
.parse(doc.data(), filter, nestingLimit);
} }
// //
// deserialize(JsonDocument&, char*, size_t, NestingLimit, Filter); // deserialize(JsonDocument&, char*, size_t, NestingLimit, Filter);
@@ -47,11 +49,12 @@ DeserializationError deserialize(JsonDocument &doc, TChar *input,
size_t inputSize, NestingLimit nestingLimit, size_t inputSize, NestingLimit nestingLimit,
TFilter filter) { TFilter filter) {
BoundedReader<TChar *> reader(input, inputSize); BoundedReader<TChar *> reader(input, inputSize);
VariantData *data = VariantAttorney::getData(doc);
MemoryPool *pool = VariantAttorney::getPool(doc);
doc.clear(); doc.clear();
return makeDeserializer<TDeserializer>( return makeDeserializer<TDeserializer>(pool, reader,
doc.memoryPool(), reader, makeStringStorage(input, pool))
makeStringStorage(input, doc.memoryPool())) .parse(*data, filter, nestingLimit);
.parse(doc.data(), filter, nestingLimit);
} }
// //
// deserialize(JsonDocument&, std::istream&, NestingLimit, Filter); // deserialize(JsonDocument&, std::istream&, NestingLimit, Filter);
@@ -61,11 +64,12 @@ template <template <typename, typename> class TDeserializer, typename TStream,
DeserializationError deserialize(JsonDocument &doc, TStream &input, DeserializationError deserialize(JsonDocument &doc, TStream &input,
NestingLimit nestingLimit, TFilter filter) { NestingLimit nestingLimit, TFilter filter) {
Reader<TStream> reader(input); Reader<TStream> reader(input);
VariantData *data = VariantAttorney::getData(doc);
MemoryPool *pool = VariantAttorney::getPool(doc);
doc.clear(); doc.clear();
return makeDeserializer<TDeserializer>( return makeDeserializer<TDeserializer>(pool, reader,
doc.memoryPool(), reader, makeStringStorage(input, pool))
makeStringStorage(input, doc.memoryPool())) .parse(*data, filter, nestingLimit);
.parse(doc.data(), filter, nestingLimit);
} }
} // namespace ARDUINOJSON_NAMESPACE } // namespace ARDUINOJSON_NAMESPACE

2
src/ArduinoJson/Document/BasicJsonDocument.hpp
View File

@@ -146,7 +146,7 @@ class BasicJsonDocument : AllocatorOwner<TAllocator>, public JsonDocument {
} }
void freePool() { void freePool() {
this->deallocate(memoryPool().buffer()); this->deallocate(getPool()->buffer());
} }
void copyAssignFrom(const JsonDocument& src) { void copyAssignFrom(const JsonDocument& src) {

10
src/ArduinoJson/Document/JsonDocument.hpp
View File

@@ -83,16 +83,6 @@ class JsonDocument : public VariantOperators<const JsonDocument&> {
return getVariant().template to<T>(); return getVariant().template to<T>();
} }
// for internal use only
MemoryPool& memoryPool() {
return _pool;
}
// for internal use only
VariantData& data() {
return _data;
}
ArrayRef createNestedArray() { ArrayRef createNestedArray() {
return add().to<ArrayRef>(); return add().to<ArrayRef>();
} }

4
src/ArduinoJson/Json/JsonDeserializer.hpp
View File

@@ -20,12 +20,12 @@ namespace ARDUINOJSON_NAMESPACE {
template <typename TReader, typename TStringStorage> template <typename TReader, typename TStringStorage>
class JsonDeserializer { class JsonDeserializer {
public: public:
JsonDeserializer(MemoryPool &pool, TReader reader, JsonDeserializer(MemoryPool *pool, TReader reader,
TStringStorage stringStorage) TStringStorage stringStorage)
: _stringStorage(stringStorage), : _stringStorage(stringStorage),
_foundSomething(false), _foundSomething(false),
_latch(reader), _latch(reader),
_pool(&pool) {} _pool(pool) {}
template <typename TFilter> template <typename TFilter>
DeserializationError parse(VariantData &variant, TFilter filter, DeserializationError parse(VariantData &variant, TFilter filter,

4
src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
View File

@@ -16,9 +16,9 @@ namespace ARDUINOJSON_NAMESPACE {
template <typename TReader, typename TStringStorage> template <typename TReader, typename TStringStorage>
class MsgPackDeserializer { class MsgPackDeserializer {
public: public:
MsgPackDeserializer(MemoryPool &pool, TReader reader, MsgPackDeserializer(MemoryPool *pool, TReader reader,
TStringStorage stringStorage) TStringStorage stringStorage)
: _pool(&pool), : _pool(pool),
_reader(reader), _reader(reader),
_stringStorage(stringStorage), _stringStorage(stringStorage),
_foundSomething(false) {} _foundSomething(false) {}

2
src/ArduinoJson/StringStorage/StringCopier.hpp
View File

@@ -10,7 +10,7 @@ namespace ARDUINOJSON_NAMESPACE {
class StringCopier { class StringCopier {
public: public:
StringCopier(MemoryPool& pool) : _pool(&pool) {} StringCopier(MemoryPool* pool) : _pool(pool) {}
void startString() { void startString() {
_pool->getFreeZone(&_ptr, &_capacity); _pool->getFreeZone(&_ptr, &_capacity);

5
src/ArduinoJson/StringStorage/StringStorage.hpp
View File

@@ -10,13 +10,14 @@
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
template <typename TInput> template <typename TInput>
StringCopier makeStringStorage(TInput&, MemoryPool& pool) { StringCopier makeStringStorage(TInput&, MemoryPool* pool) {
ARDUINOJSON_ASSERT(pool != 0);
return StringCopier(pool); return StringCopier(pool);
} }
template <typename TChar> template <typename TChar>
StringMover makeStringStorage( StringMover makeStringStorage(
TChar* input, MemoryPool&, TChar* input, MemoryPool*,
typename enable_if<!is_const<TChar>::value>::type* = 0) { typename enable_if<!is_const<TChar>::value>::type* = 0) {
return StringMover(reinterpret_cast<char*>(input)); return StringMover(reinterpret_cast<char*>(input));
} }