[Release-17] Upgrade SBI to v17.x.0

This commit is contained in:
Sukchan Lee 2023-03-01 19:56:49 +09:00
parent 969c116e77
commit 4d44b1843e
1687 changed files with 121604 additions and 9310 deletions

View file

@ -8,7 +8,11 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_create(
char *notification_uri,
OpenAPI_list_t *data_filters,
char *expiry,
char *supported_features
bool is_imm_rep,
int imm_rep,
OpenAPI_list_t *am_influ_entries,
char *supported_features,
OpenAPI_list_t *reset_ids
)
{
OpenAPI_application_data_subs_t *application_data_subs_local_var = ogs_malloc(sizeof(OpenAPI_application_data_subs_t));
@ -17,7 +21,11 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_create(
application_data_subs_local_var->notification_uri = notification_uri;
application_data_subs_local_var->data_filters = data_filters;
application_data_subs_local_var->expiry = expiry;
application_data_subs_local_var->is_imm_rep = is_imm_rep;
application_data_subs_local_var->imm_rep = imm_rep;
application_data_subs_local_var->am_influ_entries = am_influ_entries;
application_data_subs_local_var->supported_features = supported_features;
application_data_subs_local_var->reset_ids = reset_ids;
return application_data_subs_local_var;
}
@ -44,10 +52,24 @@ void OpenAPI_application_data_subs_free(OpenAPI_application_data_subs_t *applica
ogs_free(application_data_subs->expiry);
application_data_subs->expiry = NULL;
}
if (application_data_subs->am_influ_entries) {
OpenAPI_list_for_each(application_data_subs->am_influ_entries, node) {
OpenAPI_am_influ_data_free(node->data);
}
OpenAPI_list_free(application_data_subs->am_influ_entries);
application_data_subs->am_influ_entries = NULL;
}
if (application_data_subs->supported_features) {
ogs_free(application_data_subs->supported_features);
application_data_subs->supported_features = NULL;
}
if (application_data_subs->reset_ids) {
OpenAPI_list_for_each(application_data_subs->reset_ids, node) {
ogs_free(node->data);
}
OpenAPI_list_free(application_data_subs->reset_ids);
application_data_subs->reset_ids = NULL;
}
ogs_free(application_data_subs);
}
@ -94,6 +116,29 @@ cJSON *OpenAPI_application_data_subs_convertToJSON(OpenAPI_application_data_subs
}
}
if (application_data_subs->is_imm_rep) {
if (cJSON_AddBoolToObject(item, "immRep", application_data_subs->imm_rep) == NULL) {
ogs_error("OpenAPI_application_data_subs_convertToJSON() failed [imm_rep]");
goto end;
}
}
if (application_data_subs->am_influ_entries) {
cJSON *am_influ_entriesList = cJSON_AddArrayToObject(item, "amInfluEntries");
if (am_influ_entriesList == NULL) {
ogs_error("OpenAPI_application_data_subs_convertToJSON() failed [am_influ_entries]");
goto end;
}
OpenAPI_list_for_each(application_data_subs->am_influ_entries, node) {
cJSON *itemLocal = OpenAPI_am_influ_data_convertToJSON(node->data);
if (itemLocal == NULL) {
ogs_error("OpenAPI_application_data_subs_convertToJSON() failed [am_influ_entries]");
goto end;
}
cJSON_AddItemToArray(am_influ_entriesList, itemLocal);
}
}
if (application_data_subs->supported_features) {
if (cJSON_AddStringToObject(item, "supportedFeatures", application_data_subs->supported_features) == NULL) {
ogs_error("OpenAPI_application_data_subs_convertToJSON() failed [supported_features]");
@ -101,6 +146,20 @@ cJSON *OpenAPI_application_data_subs_convertToJSON(OpenAPI_application_data_subs
}
}
if (application_data_subs->reset_ids) {
cJSON *reset_idsList = cJSON_AddArrayToObject(item, "resetIds");
if (reset_idsList == NULL) {
ogs_error("OpenAPI_application_data_subs_convertToJSON() failed [reset_ids]");
goto end;
}
OpenAPI_list_for_each(application_data_subs->reset_ids, node) {
if (cJSON_AddStringToObject(reset_idsList, "", (char*)node->data) == NULL) {
ogs_error("OpenAPI_application_data_subs_convertToJSON() failed [reset_ids]");
goto end;
}
}
}
end:
return item;
}
@ -113,7 +172,12 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_parseFromJSON(cJS
cJSON *data_filters = NULL;
OpenAPI_list_t *data_filtersList = NULL;
cJSON *expiry = NULL;
cJSON *imm_rep = NULL;
cJSON *am_influ_entries = NULL;
OpenAPI_list_t *am_influ_entriesList = NULL;
cJSON *supported_features = NULL;
cJSON *reset_ids = NULL;
OpenAPI_list_t *reset_idsList = NULL;
notification_uri = cJSON_GetObjectItemCaseSensitive(application_data_subsJSON, "notificationUri");
if (!notification_uri) {
ogs_error("OpenAPI_application_data_subs_parseFromJSON() failed [notification_uri]");
@ -157,6 +221,39 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_parseFromJSON(cJS
}
}
imm_rep = cJSON_GetObjectItemCaseSensitive(application_data_subsJSON, "immRep");
if (imm_rep) {
if (!cJSON_IsBool(imm_rep)) {
ogs_error("OpenAPI_application_data_subs_parseFromJSON() failed [imm_rep]");
goto end;
}
}
am_influ_entries = cJSON_GetObjectItemCaseSensitive(application_data_subsJSON, "amInfluEntries");
if (am_influ_entries) {
cJSON *am_influ_entries_local = NULL;
if (!cJSON_IsArray(am_influ_entries)) {
ogs_error("OpenAPI_application_data_subs_parseFromJSON() failed [am_influ_entries]");
goto end;
}
am_influ_entriesList = OpenAPI_list_create();
cJSON_ArrayForEach(am_influ_entries_local, am_influ_entries) {
if (!cJSON_IsObject(am_influ_entries_local)) {
ogs_error("OpenAPI_application_data_subs_parseFromJSON() failed [am_influ_entries]");
goto end;
}
OpenAPI_am_influ_data_t *am_influ_entriesItem = OpenAPI_am_influ_data_parseFromJSON(am_influ_entries_local);
if (!am_influ_entriesItem) {
ogs_error("No am_influ_entriesItem");
OpenAPI_list_free(am_influ_entriesList);
goto end;
}
OpenAPI_list_add(am_influ_entriesList, am_influ_entriesItem);
}
}
supported_features = cJSON_GetObjectItemCaseSensitive(application_data_subsJSON, "supportedFeatures");
if (supported_features) {
if (!cJSON_IsString(supported_features) && !cJSON_IsNull(supported_features)) {
@ -165,11 +262,36 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_parseFromJSON(cJS
}
}
reset_ids = cJSON_GetObjectItemCaseSensitive(application_data_subsJSON, "resetIds");
if (reset_ids) {
cJSON *reset_ids_local = NULL;
if (!cJSON_IsArray(reset_ids)) {
ogs_error("OpenAPI_application_data_subs_parseFromJSON() failed [reset_ids]");
goto end;
}
reset_idsList = OpenAPI_list_create();
cJSON_ArrayForEach(reset_ids_local, reset_ids) {
double *localDouble = NULL;
int *localInt = NULL;
if (!cJSON_IsString(reset_ids_local)) {
ogs_error("OpenAPI_application_data_subs_parseFromJSON() failed [reset_ids]");
goto end;
}
OpenAPI_list_add(reset_idsList, ogs_strdup(reset_ids_local->valuestring));
}
}
application_data_subs_local_var = OpenAPI_application_data_subs_create (
ogs_strdup(notification_uri->valuestring),
data_filters ? data_filtersList : NULL,
expiry && !cJSON_IsNull(expiry) ? ogs_strdup(expiry->valuestring) : NULL,
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL
imm_rep ? true : false,
imm_rep ? imm_rep->valueint : 0,
am_influ_entries ? am_influ_entriesList : NULL,
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL,
reset_ids ? reset_idsList : NULL
);
return application_data_subs_local_var;
@ -181,6 +303,20 @@ end:
OpenAPI_list_free(data_filtersList);
data_filtersList = NULL;
}
if (am_influ_entriesList) {
OpenAPI_list_for_each(am_influ_entriesList, node) {
OpenAPI_am_influ_data_free(node->data);
}
OpenAPI_list_free(am_influ_entriesList);
am_influ_entriesList = NULL;
}
if (reset_idsList) {
OpenAPI_list_for_each(reset_idsList, node) {
ogs_free(node->data);
}
OpenAPI_list_free(reset_idsList);
reset_idsList = NULL;
}
return NULL;
}