removed containsKey()

containsKey() is deprecated since ArduinoJson 7.2

Author: sivar2311

src/Capabilities/ChannelController.h

@@ -157,13 +157,13 @@ bool ChannelController<T>::handleChannelController(SinricProRequest &request) {
 
   if (request.action == FSTR_CHANNEL_changeChannel) {
 
-    if (changeChannelCallback && request.request_value[FSTR_CHANNEL_channel].containsKey(FSTR_CHANNEL_name)) {
+    if (changeChannelCallback && request.request_value[FSTR_CHANNEL_channel][FSTR_CHANNEL_name].is<String>()) {
       String channelName = request.request_value[FSTR_CHANNEL_channel][FSTR_CHANNEL_name] | "";
       success = changeChannelCallback(device->deviceId, channelName);
       request.response_value[FSTR_CHANNEL_channel][FSTR_CHANNEL_name] = channelName;
     }
 
-    if (changeChannelNumberCallback && request.request_value[FSTR_CHANNEL_channel].containsKey(FSTR_CHANNEL_number)) {
+    if (changeChannelNumberCallback && request.request_value[FSTR_CHANNEL_channel][FSTR_CHANNEL_number].is<String>()) {
       String channelName("");
       int channelNumber = request.request_value[FSTR_CHANNEL_channel][FSTR_CHANNEL_number];
       success = changeChannelNumberCallback(device->deviceId, channelNumber, channelName);

src/Capabilities/ThermostatController.h

@@ -181,7 +181,7 @@ bool ThermostatController<T>::handleThermostatController(SinricProRequest &reque
 
   if (request.action == FSTR_THERMOSTAT_targetTemperature && targetTemperatureCallback) {
     float temperature;
-    if (request.request_value.containsKey(FSTR_THERMOSTAT_temperature))  {
+    if (request.request_value[FSTR_THERMOSTAT_temperature].is<Float>())  {
       temperature = request.request_value[FSTR_THERMOSTAT_temperature];
     }  else {
       temperature = 1;

src/SinricPro.h

@@ -685,7 +685,7 @@ JsonDocument SinricProClass::prepareResponse(JsonDocument& requestMessage) {
     payload[FSTR_SINRICPRO_scope]     = requestMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_scope];
     payload[FSTR_SINRICPRO_createdAt] = 0;
     payload[FSTR_SINRICPRO_deviceId]  = requestMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_deviceId];
-    if (requestMessage[FSTR_SINRICPRO_payload].containsKey(FSTR_SINRICPRO_instanceId)) payload[FSTR_SINRICPRO_instanceId] = requestMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_instanceId];
+    if (requestMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_instanceId].is<String>()) payload[FSTR_SINRICPRO_instanceId] = requestMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_instanceId];
     payload[FSTR_SINRICPRO_message]    = FSTR_SINRICPRO_OK;
     payload[FSTR_SINRICPRO_replyToken] = requestMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_replyToken];
     payload[FSTR_SINRICPRO_success]    = false;

src/SinricProSignature.cpp

@@ -71,7 +71,7 @@ String calculateSignature(const char* key, String payload) {
 }
 
 String signMessage(String key, JsonDocument &jsonMessage) {
-  if (!jsonMessage.containsKey("signature")) jsonMessage["signature"].to<JsonObject>();
+  if (!jsonMessage["signature"].is<String>()) jsonMessage["signature"].to<JsonObject>();
   jsonMessage["signature"]["HMAC"] = calculateSignature(key.c_str(), jsonMessage["payload"]);
   String signedMessageString;
   serializeJson(jsonMessage, signedMessageString);