Skip to content

Commit 3378646

Browse files
bblanchonbblanchon
committed
Reversed parameters of convertToJson() and convertFromJson()
Now the order matches copyArray(): source first, destination second.
1 parent 526cad5 commit 3378646

File tree

8 files changed

+130
-131
lines changed

8 files changed

+130
-131
lines changed

‎extras/tests/JsonVariant/converters.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ struct Date {
1313
int year;
1414
};
1515

16-
bool convertToJson(JsonVariant variant, const Date& date) {
17-
variant["day"] = date.day;
18-
variant["month"] = date.month;
19-
variant["year"] = date.year;
16+
bool convertToJson(const Date& src, JsonVariant dst) {
17+
dst["day"] = src.day;
18+
dst["month"] = src.month;
19+
dst["year"] = src.year;
2020
return true;
2121
}
2222

23-
void convertFromJson(Date& date, JsonVariantConst variant) {
24-
date.day = variant["day"];
25-
date.month = variant["month"];
26-
date.year = variant["year"];
23+
void convertFromJson(JsonVariantConst src, Date& dst) {
24+
dst.day = src["day"];
25+
dst.month = src["month"];
26+
dst.year = src["year"];
2727
}
2828

29-
bool canConvertFromJson(Date&, JsonVariantConst variant) {
30-
return variant["day"].is<int>() && variant["month"].is<int>() &&
31-
variant["year"].is<int>();
29+
bool canConvertFromJson(JsonVariantConst src, const Date&) {
30+
return src["day"].is<int>() && src["month"].is<int>() &&
31+
src["year"].is<int>();
3232
}
3333
} // namespace
3434

@@ -92,18 +92,18 @@ class Complex {
9292
namespace ARDUINOJSON_NAMESPACE {
9393
template <>
9494
struct Converter<Complex> {
95-
static bool toJson(VariantRef variant, const Complex& value) {
96-
variant["real"] = value.real();
97-
variant["imag"] = value.imag();
95+
static bool toJson(const Complex& src, VariantRef dst) {
96+
dst["real"] = src.real();
97+
dst["imag"] = src.imag();
9898
return true;
9999
}
100100

101-
static Complex fromJson(VariantConstRef variant) {
102-
return Complex(variant["real"], variant["imag"]);
101+
static Complex fromJson(VariantConstRef src) {
102+
return Complex(src["real"], src["imag"]);
103103
}
104104

105-
static bool checkJson(VariantConstRef variant) {
106-
return variant["real"].is<double>() && variant["imag"].is<double>();
105+
static bool checkJson(VariantConstRef src) {
106+
return src["real"].is<double>() && src["imag"].is<double>();
107107
}
108108
};
109109
} // namespace ARDUINOJSON_NAMESPACE

‎src/ArduinoJson/Array/ArrayRef.hpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -167,38 +167,38 @@ class ArrayRef : public ArrayRefBase<CollectionData>,
167167

168168
template <>
169169
struct Converter<ArrayConstRef> {
170-
static bool toJson(VariantRef variant, VariantConstRef value) {
171-
return variantCopyFrom(getData(variant), getData(value), getPool(variant));
170+
static bool toJson(VariantConstRef src, VariantRef dst) {
171+
return variantCopyFrom(getData(dst), getData(src), getPool(dst));
172172
}
173173

174-
static ArrayConstRef fromJson(VariantConstRef variant) {
175-
return ArrayConstRef(variantAsArray(getData(variant)));
174+
static ArrayConstRef fromJson(VariantConstRef src) {
175+
return ArrayConstRef(variantAsArray(getData(src)));
176176
}
177177

178-
static bool checkJson(VariantConstRef variant) {
179-
const VariantData* data = getData(variant);
178+
static bool checkJson(VariantConstRef src) {
179+
const VariantData* data = getData(src);
180180
return data && data->isArray();
181181
}
182182
};
183183

184184
template <>
185185
struct Converter<ArrayRef> {
186-
static bool toJson(VariantRef variant, VariantConstRef value) {
187-
return variantCopyFrom(getData(variant), getData(value), getPool(variant));
186+
static bool toJson(VariantConstRef src, VariantRef dst) {
187+
return variantCopyFrom(getData(dst), getData(src), getPool(dst));
188188
}
189189

190-
static ArrayRef fromJson(VariantRef variant) {
191-
VariantData* data = getData(variant);
192-
MemoryPool* pool = getPool(variant);
190+
static ArrayRef fromJson(VariantRef src) {
191+
VariantData* data = getData(src);
192+
MemoryPool* pool = getPool(src);
193193
return ArrayRef(pool, data != 0 ? data->asArray() : 0);
194194
}
195195

196196
static bool checkJson(VariantConstRef) {
197197
return false;
198198
}
199199

200-
static bool checkJson(VariantRef variant) {
201-
VariantData* data = getData(variant);
200+
static bool checkJson(VariantRef src) {
201+
VariantData* data = getData(src);
202202
return data && data->isArray();
203203
}
204204
};

‎src/ArduinoJson/Array/ElementProxy.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
177177
return _array.getOrAddElement(_index);
178178
}
179179

180-
friend bool convertToJson(VariantRef variant, const this_type& value) {
181-
return variant.set(value.getUpstreamElement());
180+
friend bool convertToJson(const this_type& src, VariantRef dst) {
181+
return dst.set(src.getUpstreamElement());
182182
}
183183

184184
TArray _array;

‎src/ArduinoJson/Document/JsonDocument.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ class JsonDocument : public Visitable {
337337
JsonDocument& operator=(const JsonDocument&);
338338
};
339339

340-
inline bool convertToJson(VariantRef variant, const JsonDocument& doc) {
341-
return variant.set(doc.as<VariantConstRef>());
340+
inline bool convertToJson(const JsonDocument& src, VariantRef dst) {
341+
return dst.set(src.as<VariantConstRef>());
342342
}
343343

344344
} // namespace ARDUINOJSON_NAMESPACE

‎src/ArduinoJson/Object/MemberProxy.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
186186
return _object.getOrAddMember(_key);
187187
}
188188

189-
friend bool convertToJson(VariantRef variant, const this_type &value) {
190-
return variant.set(value.getUpstreamMember());
189+
friend bool convertToJson(const this_type &src, VariantRef dst) {
190+
return dst.set(src.getUpstreamMember());
191191
}
192192

193193
TObject _object;

‎src/ArduinoJson/Object/ObjectRef.hpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -239,38 +239,38 @@ class ObjectRef : public ObjectRefBase<CollectionData>,
239239

240240
template <>
241241
struct Converter<ObjectConstRef> {
242-
static bool toJson(VariantRef variant, VariantConstRef value) {
243-
return variantCopyFrom(getData(variant), getData(value), getPool(variant));
242+
static bool toJson(VariantConstRef src, VariantRef dst) {
243+
return variantCopyFrom(getData(dst), getData(src), getPool(dst));
244244
}
245245

246-
static ObjectConstRef fromJson(VariantConstRef variant) {
247-
return ObjectConstRef(variantAsObject(getData(variant)));
246+
static ObjectConstRef fromJson(VariantConstRef src) {
247+
return ObjectConstRef(variantAsObject(getData(src)));
248248
}
249249

250-
static bool checkJson(VariantConstRef variant) {
251-
const VariantData* data = getData(variant);
250+
static bool checkJson(VariantConstRef src) {
251+
const VariantData* data = getData(src);
252252
return data && data->isObject();
253253
}
254254
};
255255

256256
template <>
257257
struct Converter<ObjectRef> {
258-
static bool toJson(VariantRef variant, VariantConstRef value) {
259-
return variantCopyFrom(getData(variant), getData(value), getPool(variant));
258+
static bool toJson(VariantConstRef src, VariantRef dst) {
259+
return variantCopyFrom(getData(dst), getData(src), getPool(dst));
260260
}
261261

262-
static ObjectRef fromJson(VariantRef variant) {
263-
VariantData* data = getData(variant);
264-
MemoryPool* pool = getPool(variant);
262+
static ObjectRef fromJson(VariantRef src) {
263+
VariantData* data = getData(src);
264+
MemoryPool* pool = getPool(src);
265265
return ObjectRef(pool, data != 0 ? data->asObject() : 0);
266266
}
267267

268268
static bool checkJson(VariantConstRef) {
269269
return false;
270270
}
271271

272-
static bool checkJson(VariantRef variant) {
273-
VariantData* data = getData(variant);
272+
static bool checkJson(VariantRef src) {
273+
VariantData* data = getData(src);
274274
return data && data->isObject();
275275
}
276276
};

0 commit comments

Comments
 (0)