[openapi] Add support for nullable fields

Depending on the OpenAPI yaml files, fields can be marked as "nullable".
Which means that the field can be either present, not present, or null.

This feature is important for example in SmContextUpdateData structure,
where many fields are described similar as the following:
This IE shall be included for the modification .... For deleting the
field, it shall contain the Null value.
This commit is contained in:
Bostjan Meglic 2023-10-05 13:39:14 +02:00 committed by Sukchan Lee
parent 7ea37ef618
commit 50464d174e
154 changed files with 2773 additions and 0 deletions

View file

@ -8,8 +8,11 @@ OpenAPI_session_rule_t *OpenAPI_session_rule_create(
OpenAPI_ambr_t *auth_sess_ambr,
OpenAPI_authorized_default_qos_t *auth_def_qos,
char *sess_rule_id,
bool is_ref_um_data_null,
char *ref_um_data,
bool is_ref_um_n3g_data_null,
char *ref_um_n3g_data,
bool is_ref_cond_data_null,
char *ref_cond_data
)
{
@ -19,8 +22,11 @@ OpenAPI_session_rule_t *OpenAPI_session_rule_create(
session_rule_local_var->auth_sess_ambr = auth_sess_ambr;
session_rule_local_var->auth_def_qos = auth_def_qos;
session_rule_local_var->sess_rule_id = sess_rule_id;
session_rule_local_var->is_ref_um_data_null = is_ref_um_data_null;
session_rule_local_var->ref_um_data = ref_um_data;
session_rule_local_var->is_ref_um_n3g_data_null = is_ref_um_n3g_data_null;
session_rule_local_var->ref_um_n3g_data = ref_um_n3g_data;
session_rule_local_var->is_ref_cond_data_null = is_ref_cond_data_null;
session_rule_local_var->ref_cond_data = ref_cond_data;
return session_rule_local_var;
@ -111,6 +117,11 @@ cJSON *OpenAPI_session_rule_convertToJSON(OpenAPI_session_rule_t *session_rule)
ogs_error("OpenAPI_session_rule_convertToJSON() failed [ref_um_data]");
goto end;
}
} else if (session_rule->is_ref_um_data_null) {
if (cJSON_AddNullToObject(item, "refUmData") == NULL) {
ogs_error("OpenAPI_session_rule_convertToJSON() failed [ref_um_data]");
goto end;
}
}
if (session_rule->ref_um_n3g_data) {
@ -118,6 +129,11 @@ cJSON *OpenAPI_session_rule_convertToJSON(OpenAPI_session_rule_t *session_rule)
ogs_error("OpenAPI_session_rule_convertToJSON() failed [ref_um_n3g_data]");
goto end;
}
} else if (session_rule->is_ref_um_n3g_data_null) {
if (cJSON_AddNullToObject(item, "refUmN3gData") == NULL) {
ogs_error("OpenAPI_session_rule_convertToJSON() failed [ref_um_n3g_data]");
goto end;
}
}
if (session_rule->ref_cond_data) {
@ -125,6 +141,11 @@ cJSON *OpenAPI_session_rule_convertToJSON(OpenAPI_session_rule_t *session_rule)
ogs_error("OpenAPI_session_rule_convertToJSON() failed [ref_cond_data]");
goto end;
}
} else if (session_rule->is_ref_cond_data_null) {
if (cJSON_AddNullToObject(item, "refCondData") == NULL) {
ogs_error("OpenAPI_session_rule_convertToJSON() failed [ref_cond_data]");
goto end;
}
}
end:
@ -173,34 +194,43 @@ OpenAPI_session_rule_t *OpenAPI_session_rule_parseFromJSON(cJSON *session_ruleJS
ref_um_data = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "refUmData");
if (ref_um_data) {
if (!cJSON_IsNull(ref_um_data)) {
if (!cJSON_IsString(ref_um_data) && !cJSON_IsNull(ref_um_data)) {
ogs_error("OpenAPI_session_rule_parseFromJSON() failed [ref_um_data]");
goto end;
}
}
}
ref_um_n3g_data = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "refUmN3gData");
if (ref_um_n3g_data) {
if (!cJSON_IsNull(ref_um_n3g_data)) {
if (!cJSON_IsString(ref_um_n3g_data) && !cJSON_IsNull(ref_um_n3g_data)) {
ogs_error("OpenAPI_session_rule_parseFromJSON() failed [ref_um_n3g_data]");
goto end;
}
}
}
ref_cond_data = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "refCondData");
if (ref_cond_data) {
if (!cJSON_IsNull(ref_cond_data)) {
if (!cJSON_IsString(ref_cond_data) && !cJSON_IsNull(ref_cond_data)) {
ogs_error("OpenAPI_session_rule_parseFromJSON() failed [ref_cond_data]");
goto end;
}
}
}
session_rule_local_var = OpenAPI_session_rule_create (
auth_sess_ambr ? auth_sess_ambr_local_nonprim : NULL,
auth_def_qos ? auth_def_qos_local_nonprim : NULL,
ogs_strdup(sess_rule_id->valuestring),
ref_um_data && cJSON_IsNull(ref_um_data) ? true : false,
ref_um_data && !cJSON_IsNull(ref_um_data) ? ogs_strdup(ref_um_data->valuestring) : NULL,
ref_um_n3g_data && cJSON_IsNull(ref_um_n3g_data) ? true : false,
ref_um_n3g_data && !cJSON_IsNull(ref_um_n3g_data) ? ogs_strdup(ref_um_n3g_data->valuestring) : NULL,
ref_cond_data && cJSON_IsNull(ref_cond_data) ? true : false,
ref_cond_data && !cJSON_IsNull(ref_cond_data) ? ogs_strdup(ref_cond_data->valuestring) : NULL
);