Merge pull request #162 from ityuhui/yh-string-null-1229

Allow cJSON_IsNull() if the string is not mandatory

kubernetes/external/cJSON.c

@@ -125,7 +125,7 @@ typedef struct internal_hooks
 } internal_hooks;
 
 #if defined(_MSC_VER)
-/* work around MSVC error C2322: '...' address of dillimport '...' is not static */
+/* work around MSVC error C2322: '...' address of dllimport '...' is not static */
 static void *internal_malloc(size_t size)
 {
     return malloc(size);

kubernetes/model/admissionregistration_v1_service_reference.c

@@ -119,7 +119,7 @@ admissionregistration_v1_service_reference_t *admissionregistration_v1_service_r
     // admissionregistration_v1_service_reference->path
     cJSON *path = cJSON_GetObjectItemCaseSensitive(admissionregistration_v1_service_referenceJSON, "path");
     if (path) { 
-    if(!cJSON_IsString(path))
+    if(!cJSON_IsString(path) && !cJSON_IsNull(path))
     {
     goto end; //String
     }
@@ -138,7 +138,7 @@ admissionregistration_v1_service_reference_t *admissionregistration_v1_service_r
     admissionregistration_v1_service_reference_local_var = admissionregistration_v1_service_reference_create (
         strdup(name->valuestring),
         strdup(_namespace->valuestring),
-        path ? strdup(path->valuestring) : NULL,
+        path && !cJSON_IsNull(path) ? strdup(path->valuestring) : NULL,
         port ? port->valuedouble : 0
         );
 

kubernetes/model/admissionregistration_v1_webhook_client_config.c

@@ -106,7 +106,7 @@ admissionregistration_v1_webhook_client_config_t *admissionregistration_v1_webho
     // admissionregistration_v1_webhook_client_config->url
     cJSON *url = cJSON_GetObjectItemCaseSensitive(admissionregistration_v1_webhook_client_configJSON, "url");
     if (url) { 
-    if(!cJSON_IsString(url))
+    if(!cJSON_IsString(url) && !cJSON_IsNull(url))
     {
     goto end; //String
     }
@@ -116,7 +116,7 @@ admissionregistration_v1_webhook_client_config_t *admissionregistration_v1_webho
     admissionregistration_v1_webhook_client_config_local_var = admissionregistration_v1_webhook_client_config_create (
         ca_bundle ? strdup(ca_bundle->valuestring) : NULL,
         service ? service_local_nonprim : NULL,
-        url ? strdup(url->valuestring) : NULL
+        url && !cJSON_IsNull(url) ? strdup(url->valuestring) : NULL
         );
 
     return admissionregistration_v1_webhook_client_config_local_var;

kubernetes/model/apiextensions_v1_service_reference.c

@@ -119,7 +119,7 @@ apiextensions_v1_service_reference_t *apiextensions_v1_service_reference_parseFr
     // apiextensions_v1_service_reference->path
     cJSON *path = cJSON_GetObjectItemCaseSensitive(apiextensions_v1_service_referenceJSON, "path");
     if (path) { 
-    if(!cJSON_IsString(path))
+    if(!cJSON_IsString(path) && !cJSON_IsNull(path))
     {
     goto end; //String
     }
@@ -138,7 +138,7 @@ apiextensions_v1_service_reference_t *apiextensions_v1_service_reference_parseFr
     apiextensions_v1_service_reference_local_var = apiextensions_v1_service_reference_create (
         strdup(name->valuestring),
         strdup(_namespace->valuestring),
-        path ? strdup(path->valuestring) : NULL,
+        path && !cJSON_IsNull(path) ? strdup(path->valuestring) : NULL,
         port ? port->valuedouble : 0
         );
 

kubernetes/model/apiextensions_v1_webhook_client_config.c

@@ -106,7 +106,7 @@ apiextensions_v1_webhook_client_config_t *apiextensions_v1_webhook_client_config
     // apiextensions_v1_webhook_client_config->url
     cJSON *url = cJSON_GetObjectItemCaseSensitive(apiextensions_v1_webhook_client_configJSON, "url");
     if (url) { 
-    if(!cJSON_IsString(url))
+    if(!cJSON_IsString(url) && !cJSON_IsNull(url))
     {
     goto end; //String
     }
@@ -116,7 +116,7 @@ apiextensions_v1_webhook_client_config_t *apiextensions_v1_webhook_client_config
     apiextensions_v1_webhook_client_config_local_var = apiextensions_v1_webhook_client_config_create (
         ca_bundle ? strdup(ca_bundle->valuestring) : NULL,
         service ? service_local_nonprim : NULL,
-        url ? strdup(url->valuestring) : NULL
+        url && !cJSON_IsNull(url) ? strdup(url->valuestring) : NULL
         );
 
     return apiextensions_v1_webhook_client_config_local_var;

kubernetes/model/apiregistration_v1_service_reference.c

@@ -79,7 +79,7 @@ apiregistration_v1_service_reference_t *apiregistration_v1_service_reference_par
     // apiregistration_v1_service_reference->name
     cJSON *name = cJSON_GetObjectItemCaseSensitive(apiregistration_v1_service_referenceJSON, "name");
     if (name) { 
-    if(!cJSON_IsString(name))
+    if(!cJSON_IsString(name) && !cJSON_IsNull(name))
     {
     goto end; //String
     }
@@ -88,7 +88,7 @@ apiregistration_v1_service_reference_t *apiregistration_v1_service_reference_par
     // apiregistration_v1_service_reference->_namespace
     cJSON *_namespace = cJSON_GetObjectItemCaseSensitive(apiregistration_v1_service_referenceJSON, "namespace");
     if (_namespace) { 
-    if(!cJSON_IsString(_namespace))
+    if(!cJSON_IsString(_namespace) && !cJSON_IsNull(_namespace))
     {
     goto end; //String
     }
@@ -105,8 +105,8 @@ apiregistration_v1_service_reference_t *apiregistration_v1_service_reference_par
 
 
     apiregistration_v1_service_reference_local_var = apiregistration_v1_service_reference_create (
-        name ? strdup(name->valuestring) : NULL,
-        _namespace ? strdup(_namespace->valuestring) : NULL,
+        name && !cJSON_IsNull(name) ? strdup(name->valuestring) : NULL,
+        _namespace && !cJSON_IsNull(_namespace) ? strdup(_namespace->valuestring) : NULL,
         port ? port->valuedouble : 0
         );
 

kubernetes/model/authentication_v1_token_request.c

@@ -136,7 +136,7 @@ authentication_v1_token_request_t *authentication_v1_token_request_parseFromJSON
     // authentication_v1_token_request->api_version
     cJSON *api_version = cJSON_GetObjectItemCaseSensitive(authentication_v1_token_requestJSON, "apiVersion");
     if (api_version) { 
-    if(!cJSON_IsString(api_version))
+    if(!cJSON_IsString(api_version) && !cJSON_IsNull(api_version))
     {
     goto end; //String
     }
@@ -145,7 +145,7 @@ authentication_v1_token_request_t *authentication_v1_token_request_parseFromJSON
     // authentication_v1_token_request->kind
     cJSON *kind = cJSON_GetObjectItemCaseSensitive(authentication_v1_token_requestJSON, "kind");
     if (kind) { 
-    if(!cJSON_IsString(kind))
+    if(!cJSON_IsString(kind) && !cJSON_IsNull(kind))
     {
     goto end; //String
     }
@@ -174,8 +174,8 @@ authentication_v1_token_request_t *authentication_v1_token_request_parseFromJSON
 
 
     authentication_v1_token_request_local_var = authentication_v1_token_request_create (
-        api_version ? strdup(api_version->valuestring) : NULL,
-        kind ? strdup(kind->valuestring) : NULL,
+        api_version && !cJSON_IsNull(api_version) ? strdup(api_version->valuestring) : NULL,
+        kind && !cJSON_IsNull(kind) ? strdup(kind->valuestring) : NULL,
         metadata ? metadata_local_nonprim : NULL,
         spec_local_nonprim,
         status ? status_local_nonprim : NULL

kubernetes/model/core_v1_endpoint_port.c

@@ -94,7 +94,7 @@ core_v1_endpoint_port_t *core_v1_endpoint_port_parseFromJSON(cJSON *core_v1_endp
     // core_v1_endpoint_port->app_protocol
     cJSON *app_protocol = cJSON_GetObjectItemCaseSensitive(core_v1_endpoint_portJSON, "appProtocol");
     if (app_protocol) { 
-    if(!cJSON_IsString(app_protocol))
+    if(!cJSON_IsString(app_protocol) && !cJSON_IsNull(app_protocol))
     {
     goto end; //String
     }
@@ -103,7 +103,7 @@ core_v1_endpoint_port_t *core_v1_endpoint_port_parseFromJSON(cJSON *core_v1_endp
     // core_v1_endpoint_port->name
     cJSON *name = cJSON_GetObjectItemCaseSensitive(core_v1_endpoint_portJSON, "name");
     if (name) { 
-    if(!cJSON_IsString(name))
+    if(!cJSON_IsString(name) && !cJSON_IsNull(name))
     {
     goto end; //String
     }
@@ -124,18 +124,18 @@ core_v1_endpoint_port_t *core_v1_endpoint_port_parseFromJSON(cJSON *core_v1_endp
     // core_v1_endpoint_port->protocol
     cJSON *protocol = cJSON_GetObjectItemCaseSensitive(core_v1_endpoint_portJSON, "protocol");
     if (protocol) { 
-    if(!cJSON_IsString(protocol))
+    if(!cJSON_IsString(protocol) && !cJSON_IsNull(protocol))
     {
     goto end; //String
     }
     }
 
 
     core_v1_endpoint_port_local_var = core_v1_endpoint_port_create (
-        app_protocol ? strdup(app_protocol->valuestring) : NULL,
-        name ? strdup(name->valuestring) : NULL,
+        app_protocol && !cJSON_IsNull(app_protocol) ? strdup(app_protocol->valuestring) : NULL,
+        name && !cJSON_IsNull(name) ? strdup(name->valuestring) : NULL,
         port->valuedouble,
-        protocol ? strdup(protocol->valuestring) : NULL
+        protocol && !cJSON_IsNull(protocol) ? strdup(protocol->valuestring) : NULL
         );
 
     return core_v1_endpoint_port_local_var;

kubernetes/model/core_v1_event.c

@@ -317,7 +317,7 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){
     // core_v1_event->action
     cJSON *action = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "action");
     if (action) { 
-    if(!cJSON_IsString(action))
+    if(!cJSON_IsString(action) && !cJSON_IsNull(action))
     {
     goto end; //String
     }
@@ -326,7 +326,7 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){
     // core_v1_event->api_version
     cJSON *api_version = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "apiVersion");
     if (api_version) { 
-    if(!cJSON_IsString(api_version))
+    if(!cJSON_IsString(api_version) && !cJSON_IsNull(api_version))
     {
     goto end; //String
     }
@@ -371,7 +371,7 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){
     // core_v1_event->kind
     cJSON *kind = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "kind");
     if (kind) { 
-    if(!cJSON_IsString(kind))
+    if(!cJSON_IsString(kind) && !cJSON_IsNull(kind))
     {
     goto end; //String
     }
@@ -389,7 +389,7 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){
     // core_v1_event->message
     cJSON *message = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "message");
     if (message) { 
-    if(!cJSON_IsString(message))
+    if(!cJSON_IsString(message) && !cJSON_IsNull(message))
     {
     goto end; //String
     }
@@ -407,7 +407,7 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){
     // core_v1_event->reason
     cJSON *reason = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "reason");
     if (reason) { 
-    if(!cJSON_IsString(reason))
+    if(!cJSON_IsString(reason) && !cJSON_IsNull(reason))
     {
     goto end; //String
     }
@@ -422,7 +422,7 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){
     // core_v1_event->reporting_component
     cJSON *reporting_component = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "reportingComponent");
     if (reporting_component) { 
-    if(!cJSON_IsString(reporting_component))
+    if(!cJSON_IsString(reporting_component) && !cJSON_IsNull(reporting_component))
     {
     goto end; //String
     }
@@ -431,7 +431,7 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){
     // core_v1_event->reporting_instance
     cJSON *reporting_instance = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "reportingInstance");
     if (reporting_instance) { 
-    if(!cJSON_IsString(reporting_instance))
+    if(!cJSON_IsString(reporting_instance) && !cJSON_IsNull(reporting_instance))
     {
     goto end; //String
     }
@@ -452,31 +452,31 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){
     // core_v1_event->type
     cJSON *type = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "type");
     if (type) { 
-    if(!cJSON_IsString(type))
+    if(!cJSON_IsString(type) && !cJSON_IsNull(type))
     {
     goto end; //String
     }
     }
 
 
     core_v1_event_local_var = core_v1_event_create (
-        action ? strdup(action->valuestring) : NULL,
-        api_version ? strdup(api_version->valuestring) : NULL,
+        action && !cJSON_IsNull(action) ? strdup(action->valuestring) : NULL,
+        api_version && !cJSON_IsNull(api_version) ? strdup(api_version->valuestring) : NULL,
         count ? count->valuedouble : 0,
         event_time && !cJSON_IsNull(event_time) ? strdup(event_time->valuestring) : NULL,
         first_timestamp && !cJSON_IsNull(first_timestamp) ? strdup(first_timestamp->valuestring) : NULL,
         involved_object_local_nonprim,
-        kind ? strdup(kind->valuestring) : NULL,
+        kind && !cJSON_IsNull(kind) ? strdup(kind->valuestring) : NULL,
         last_timestamp && !cJSON_IsNull(last_timestamp) ? strdup(last_timestamp->valuestring) : NULL,
-        message ? strdup(message->valuestring) : NULL,
+        message && !cJSON_IsNull(message) ? strdup(message->valuestring) : NULL,
         metadata_local_nonprim,
-        reason ? strdup(reason->valuestring) : NULL,
+        reason && !cJSON_IsNull(reason) ? strdup(reason->valuestring) : NULL,
         related ? related_local_nonprim : NULL,
-        reporting_component ? strdup(reporting_component->valuestring) : NULL,
-        reporting_instance ? strdup(reporting_instance->valuestring) : NULL,
+        reporting_component && !cJSON_IsNull(reporting_component) ? strdup(reporting_component->valuestring) : NULL,
+        reporting_instance && !cJSON_IsNull(reporting_instance) ? strdup(reporting_instance->valuestring) : NULL,
         series ? series_local_nonprim : NULL,
         source ? source_local_nonprim : NULL,
-        type ? strdup(type->valuestring) : NULL
+        type && !cJSON_IsNull(type) ? strdup(type->valuestring) : NULL
         );
 
     return core_v1_event_local_var;

kubernetes/model/core_v1_event_list.c

@@ -124,7 +124,7 @@ core_v1_event_list_t *core_v1_event_list_parseFromJSON(cJSON *core_v1_event_list
     // core_v1_event_list->api_version
     cJSON *api_version = cJSON_GetObjectItemCaseSensitive(core_v1_event_listJSON, "apiVersion");
     if (api_version) { 
-    if(!cJSON_IsString(api_version))
+    if(!cJSON_IsString(api_version) && !cJSON_IsNull(api_version))
     {
     goto end; //String
     }
@@ -157,7 +157,7 @@ core_v1_event_list_t *core_v1_event_list_parseFromJSON(cJSON *core_v1_event_list
     // core_v1_event_list->kind
     cJSON *kind = cJSON_GetObjectItemCaseSensitive(core_v1_event_listJSON, "kind");
     if (kind) { 
-    if(!cJSON_IsString(kind))
+    if(!cJSON_IsString(kind) && !cJSON_IsNull(kind))
     {
     goto end; //String
     }
@@ -171,9 +171,9 @@ core_v1_event_list_t *core_v1_event_list_parseFromJSON(cJSON *core_v1_event_list
 
 
     core_v1_event_list_local_var = core_v1_event_list_create (
-        api_version ? strdup(api_version->valuestring) : NULL,
+        api_version && !cJSON_IsNull(api_version) ? strdup(api_version->valuestring) : NULL,
         itemsList,
-        kind ? strdup(kind->valuestring) : NULL,
+        kind && !cJSON_IsNull(kind) ? strdup(kind->valuestring) : NULL,
         metadata ? metadata_local_nonprim : NULL
         );
 

kubernetes/model/discovery_v1_endpoint_port.c

@@ -93,7 +93,7 @@ discovery_v1_endpoint_port_t *discovery_v1_endpoint_port_parseFromJSON(cJSON *di
     // discovery_v1_endpoint_port->app_protocol
     cJSON *app_protocol = cJSON_GetObjectItemCaseSensitive(discovery_v1_endpoint_portJSON, "appProtocol");
     if (app_protocol) { 
-    if(!cJSON_IsString(app_protocol))
+    if(!cJSON_IsString(app_protocol) && !cJSON_IsNull(app_protocol))
     {
     goto end; //String
     }
@@ -102,7 +102,7 @@ discovery_v1_endpoint_port_t *discovery_v1_endpoint_port_parseFromJSON(cJSON *di
     // discovery_v1_endpoint_port->name
     cJSON *name = cJSON_GetObjectItemCaseSensitive(discovery_v1_endpoint_portJSON, "name");
     if (name) { 
-    if(!cJSON_IsString(name))
+    if(!cJSON_IsString(name) && !cJSON_IsNull(name))
     {
     goto end; //String
     }
@@ -120,18 +120,18 @@ discovery_v1_endpoint_port_t *discovery_v1_endpoint_port_parseFromJSON(cJSON *di
     // discovery_v1_endpoint_port->protocol
     cJSON *protocol = cJSON_GetObjectItemCaseSensitive(discovery_v1_endpoint_portJSON, "protocol");
     if (protocol) { 
-    if(!cJSON_IsString(protocol))
+    if(!cJSON_IsString(protocol) && !cJSON_IsNull(protocol))
     {
     goto end; //String
     }
     }
 
 
     discovery_v1_endpoint_port_local_var = discovery_v1_endpoint_port_create (
-        app_protocol ? strdup(app_protocol->valuestring) : NULL,
-        name ? strdup(name->valuestring) : NULL,
+        app_protocol && !cJSON_IsNull(app_protocol) ? strdup(app_protocol->valuestring) : NULL,
+        name && !cJSON_IsNull(name) ? strdup(name->valuestring) : NULL,
         port ? port->valuedouble : 0,
-        protocol ? strdup(protocol->valuestring) : NULL
+        protocol && !cJSON_IsNull(protocol) ? strdup(protocol->valuestring) : NULL
         );
 
     return discovery_v1_endpoint_port_local_var;