chore: make atclient support multiple json providers

atsign-foundation · Dec 5, 2024 · c3d25a8 · c3d25a8
1 parent 75f81a9
commit c3d25a8
Show file tree

Hide file tree

Showing 7 changed files with 1,445 additions and 1,437 deletions.
diff --git a/packages/atclient/include/atclient/atnotification.h b/packages/atclient/include/atclient/atnotification.h
@@ -96,7 +96,6 @@ void atclient_atnotification_init(atclient_atnotification *notification);
 void atclient_atnotification_free(atclient_atnotification *notification);
 
 int atclient_atnotification_from_json_str(atclient_atnotification *notification, const char *json_str);
-int atclient_atnotification_from_cjson_node(atclient_atnotification *notification, const cJSON *root);
 
 // Check if a field is initialized
 bool atclient_atnotification_is_id_initialized(const atclient_atnotification *notification);

diff --git a/packages/atclient/include/atclient/cjson.h → packages/atclient/include/atclient/json.h b/packages/atclient/include/atclient/cjson.h → packages/atclient/include/atclient/json.h
@@ -1,9 +1,12 @@
-#ifndef ATCLIENT_CJSON_H
-#define ATCLIENT_CJSON_H
+#ifndef ATCLIENT_JSON_H
+#define ATCLIENT_JSON_H
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define ATCLIENT_JSON_PROVIDER_CJSON 1
+#define ATCLIENT_JSON_PROVIDER ATCLIENT_JSON_PROVIDER_CJSON
+
 #if defined(CONFIG_IDF_TARGET_ESP32)
 #include <cjson.h> // IWYU pragma: export
 #else

diff --git a/packages/atclient/include/atclient/metadata.h b/packages/atclient/include/atclient/metadata.h
@@ -286,16 +286,6 @@ int atclient_atkey_metadata_clone(atclient_atkey_metadata *dst, const atclient_a
  */
 int atclient_atkey_metadata_from_json_str(atclient_atkey_metadata *metadata, const char *metadata_str);
 
-/**
- * @brief Populates the metadata struct from a cJSON pointer. This function is good for debugging.
- *
- * @param metadata the metadata struct to populate
- * @param json the json object to populate from
- * @return int 0 on success
- */
-
-int atclient_atkey_metadata_from_cjson_node(atclient_atkey_metadata *metadata, const cJSON *json);
-
 /**
  * @brief Reads metadata struct and converts it to a json formatted string. This function should mostly be used for
  * debugging only. See atclient_atkey_metadata_to_protocolstr for a more useful function when working with atProtocol