Extract both updateProperty and getPropertyNameByIdentifier from ArduinoCloudThing since those functions don't really concern themselves with cbor encoding/decoding

Author: aentinger

src/cbor/ArduinoCloudThing.cpp

@@ -264,7 +264,7 @@ ArduinoCloudThing::MapParserState ArduinoCloudThing::handle_Name(CborValue * val
       map_data->name_identifier.set(val & 255);
       map_data->attribute_identifier.set(val >> 8);
       map_data->light_payload.set(true);
-      String name = getPropertyNameByIdentifier(val);
+      String name = getPropertyNameByIdentifier(*_property_container, val);
       map_data->name.set(name);
 
 
@@ -353,7 +353,7 @@ ArduinoCloudThing::MapParserState ArduinoCloudThing::handle_LeaveMap(CborValue *
 
     if (_currentPropertyName != "" && propertyName != _currentPropertyName) {
       /* Update the property containers depending on the parsed data */
-      updateProperty(_currentPropertyName, _currentPropertyBaseTime + _currentPropertyTime);
+      updateProperty(*_property_container, _currentPropertyName, _currentPropertyBaseTime + _currentPropertyTime, _isSyncMessage, &_map_data_list);
       /* Reset current property data */
       freeMapDataList(&_map_data_list);
       _currentPropertyBaseTime = 0;
@@ -376,7 +376,7 @@ ArduinoCloudThing::MapParserState ArduinoCloudThing::handle_LeaveMap(CborValue *
       next_state = MapParserState::EnterMap;
     } else {
       /* Update the property containers depending on the parsed data */
-      updateProperty(_currentPropertyName, _currentPropertyBaseTime + _currentPropertyTime);
+      updateProperty(*_property_container, _currentPropertyName, _currentPropertyBaseTime + _currentPropertyTime, _isSyncMessage, &_map_data_list);
       /* Reset last property data */
       freeMapDataList(&_map_data_list);
       next_state = MapParserState::Complete;
@@ -397,31 +397,6 @@ void ArduinoCloudThing::freeMapDataList(std::list<CborMapData *> * map_data_list
   map_data_list->clear();
 }
 
-void ArduinoCloudThing::updateProperty(String propertyName, unsigned long cloudChangeEventTime) {
-  Property* property = getProperty(*_property_container, propertyName);
-  if (property && property->isWriteableByCloud()) {
-    property->setLastCloudChangeTimestamp(cloudChangeEventTime);
-    property->setAttributesFromCloud(&_map_data_list);
-    if (_isSyncMessage) {
-      property->execCallbackOnSync();
-    } else {
-      property->fromCloudToLocal();
-      property->execCallbackOnChange();
-    }
-  }
-}
-
-// retrieve the property name by the identifier
-String ArduinoCloudThing::getPropertyNameByIdentifier(int propertyIdentifier) {
-  Property* property;
-  if (propertyIdentifier > 255) {
-    property = getProperty(*_property_container, propertyIdentifier & 255);
-  } else {
-    property = getProperty(*_property_container, propertyIdentifier);
-  }
-  return property->name();
-}
-
 bool ArduinoCloudThing::ifNumericConvertToDouble(CborValue * value_iter, double * numeric_val) {
 
   if (cbor_value_is_integer(value_iter)) {

src/cbor/ArduinoCloudThing.h

@@ -87,8 +87,6 @@ class ArduinoCloudThing {
     /* decode a CBOR payload received from the cloud */
     void decode(uint8_t const * const payload, size_t const length, bool isSyncMessage = false);
 
-    void updateProperty(String propertyName, unsigned long cloudChangeEventTime);
-    String getPropertyNameByIdentifier(int propertyIdentifier);
 
   private:
     PropertyContainer * _property_container;

src/property/PropertyContainer.cpp

@@ -120,6 +120,38 @@ void updateTimestampOnLocallyChangedProperties(PropertyContainer & prop_cont)
                 });
 }
 
+void updateProperty(PropertyContainer & prop_cont, String propertyName, unsigned long cloudChangeEventTime, bool const is_sync_message, std::list<CborMapData *> * map_data_list)
+{
+  Property * property = getProperty(prop_cont, propertyName);
+
+  if (property && property->isWriteableByCloud())
+  {
+    property->setLastCloudChangeTimestamp(cloudChangeEventTime);
+    property->setAttributesFromCloud(map_data_list);
+    if (is_sync_message) {
+      property->execCallbackOnSync();
+    } else {
+      property->fromCloudToLocal();
+      property->execCallbackOnChange();
+    }
+  }
+}
+
+String getPropertyNameByIdentifier(PropertyContainer & prop_cont, int propertyIdentifier)
+{
+  Property * property = nullptr;
+
+  if (propertyIdentifier > 255)
+    property = getProperty(prop_cont, propertyIdentifier & 255);
+  else
+    property = getProperty(prop_cont, propertyIdentifier);
+
+  if (property)
+    return property->name();
+  else
+    return String("");
+}
+
 /******************************************************************************
    PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/

src/property/PropertyContainer.h

@@ -63,6 +63,9 @@ Property * getProperty(PropertyContainer & prop_cont, int const identifier);
 int appendChangedProperties(PropertyContainer & prop_cont, CborEncoder * arrayEncoder, bool lightPayload);
 void updateTimestampOnLocallyChangedProperties(PropertyContainer & prop_cont);
 void requestUpdateForAllProperties(PropertyContainer & prop_cont);
+void updateProperty(PropertyContainer & prop_cont, String propertyName, unsigned long cloudChangeEventTime, bool const is_sync_message, std::list<CborMapData *> * map_data_list);
+String getPropertyNameByIdentifier(PropertyContainer & prop_cont, int propertyIdentifier);
+
 
 void addProperty(PropertyContainer & prop_cont, Property * property_obj, int propertyIdentifier);