From b29e46eb44c54264ab698b143c89a4f49e6a281b Mon Sep 17 00:00:00 2001 From: Michele Albano Date: Mon, 16 Mar 2020 06:12:16 -0700 Subject: [PATCH 1/6] Removed stray "printf"s in modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java --- .../openapitools/codegen/languages/CLibcurlClientCodegen.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java index 0be8ee130b2b..a5bab8b9c628 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java @@ -617,9 +617,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { } else { setProjectName(defaultProjectName); } - System.out.println("michele was here preprocessOpenAPI "+projectName); additionalProperties.put(PROJECT_NAME, projectName); - System.out.println("michele was here preprocessOpenAPI after "+projectName); } public void setProjectName(String projectName) { From 806f2060a75d55cedc9c8b4db5eb917fd37ed52a Mon Sep 17 00:00:00 2001 From: Michele Albano Date: Mon, 16 Mar 2020 08:28:03 -0700 Subject: [PATCH 2/6] Support for booleans in C client --- .../resources/C-libcurl/model-body.mustache | 48 +++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache index 5e3e49c29e46..c1a20b94b864 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache @@ -37,6 +37,11 @@ cJSON *{{classFilename}}_{{classname}}_convertToJSON({{projectName}}_{{classVarN goto fail; } {{/isNumeric}} +{{#isBoolean}} + if(cJSON_AddBoolToObject(item, "{{{classname}}}", {{{classname}}}) == NULL) { + goto fail; + } +{{/isBoolean}} return item; fail: cJSON_Delete(item); @@ -389,12 +394,18 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) { goto fail; } {{/isString}} - {{^isString}} + {{#isBoolean}} + if(cJSON_AddBoolToObject({{{name}}}, "", *(cJSON_bool *){{{name}}}ListEntry->data) == NULL) + { + goto fail; + } + {{/isBoolean}} + {{^isNumeric}} if(cJSON_AddNumberToObject({{{name}}}, "", *(double *){{{name}}}ListEntry->data) == NULL) { goto fail; } - {{/isString}} + {{/isNumeric}} {{/items}} } {{/isPrimitiveType}} @@ -433,12 +444,19 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) { goto fail; } {{/isString}} - {{^isString}} + {{#isNumeric}} if(cJSON_AddNumberToObject(localMapObject, localKeyValue->key, *(double *)localKeyValue->value) == NULL) { goto fail; } - {{/isString}} + {{/isNumeric}} + {{#isBoolean}} +// if(cJSON_AddBoolToObject(localMapObject, localKeyValue->key, (cJSON_bool)localKeyValue->value) == NULL) + if(cJSON_AddBoolToObject(localMapObject, localKeyValue->key, *(cJSON_bool *)localKeyValue->value) == NULL) + { + goto fail; + } + {{/isBoolean}} {{/items}} } } @@ -598,13 +616,20 @@ fail: } list_addElement({{{name}}}List , strdup({{{name}}}_local->valuestring)); {{/isString}} - {{^isString}} + {{#isNumeric}} if(!cJSON_IsNumber({{{name}}}_local)) { goto end; } list_addElement({{{name}}}List , &{{{name}}}_local->valuedouble); - {{/isString}} + {{/isNumeric}} + {{#isBoolean}} + if(!cJSON_IsBool({{{name}}}_local)) + { + goto end; + } + list_addElement({{{name}}}List , {{{name}}}_local->valueint); + {{/isBoolean}} {{/items}} } {{/isPrimitiveType}} @@ -649,13 +674,20 @@ fail: } localMapKeyPair = keyValuePair_create(strdup(localMapObject->string),strdup(localMapObject->valuestring)); {{/isString}} - {{^isString}} + {{#isBoolean}} + if(!cJSON_IsBool(localMapObject)) + { + goto end; + } + localMapKeyPair = keyValuePair_create(strdup(localMapObject->string), &localMapObject->valueint); + {{/isBoolean}} + {{#isNumeric}} if(!cJSON_IsNumber(localMapObject)) { goto end; } localMapKeyPair = keyValuePair_create(strdup(localMapObject->string),&localMapObject->valuedouble ); - {{/isString}} + {{/isNumeric}} {{/items}} list_addElement({{{name}}}List , localMapKeyPair); } From cf528fd3cc223a49b3264cdd66113dfa8967d3cf Mon Sep 17 00:00:00 2001 From: Michele Albano Date: Wed, 18 Mar 2020 03:38:07 +0100 Subject: [PATCH 3/6] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d5faf19b02b3..46acba318b9a 100644 --- a/README.md +++ b/README.md @@ -922,7 +922,7 @@ If you want to join the committee, please kindly apply by sending an email to te | Languages | Member (join date) | |:-------------|:-------------| | ActionScript | | -| Ada | @stcarrez (2018/02) @micheleISEP (2018/02) | +| Ada | @stcarrez (2018/02) @michelealbano (2018/02) | | Android | @jaz-ah (2017/09) | | Apex | | | Bash | @frol (2017/07) @bkryza (2017/08) @kenjones-cisco (2017/09) | @@ -990,7 +990,7 @@ OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/ - [Marcin Stefaniuk](https://github.com/mstefaniuk) - [Martin Delille](https://github.com/MartinDelille) - [Masahiro Yamauchi](https://github.com/algas) -- [Michele Albano](https://github.com/micheleISEP) +- [Michele Albano](https://github.com/michelealbano) - [Ramzi Maalej](https://github.com/ramzimaalej) - [Ravindra Nikam](https://github.com/ravinikam) - [Ricardo Cardona](https://github.com/ricardona) From ee01a9eb8f4ac9bad43394bf8e0d07198dbaeb7f Mon Sep 17 00:00:00 2001 From: Michele Albano Date: Tue, 17 Mar 2020 19:41:07 -0700 Subject: [PATCH 4/6] Change to C API mustache files to solve issue #5623 --- .../main/resources/C-libcurl/api-body.mustache | 3 ++- .../resources/C-libcurl/api-header.mustache | 3 ++- samples/client/petstore/c/api/PetAPI.c | 18 ++++++++++-------- samples/client/petstore/c/api/PetAPI.h | 18 ++++++++++-------- samples/client/petstore/c/api/StoreAPI.c | 7 ++++--- samples/client/petstore/c/api/StoreAPI.h | 7 ++++--- samples/client/petstore/c/api/UserAPI.c | 16 +++++++++------- samples/client/petstore/c/api/UserAPI.h | 16 +++++++++------- samples/client/petstore/c/model/pet.c | 4 ++++ 9 files changed, 54 insertions(+), 38 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache index c8daaf0e444b..b87d5ea62f19 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache @@ -99,7 +99,8 @@ end: // {{/notes}} {{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMapContainer}}{{{.}}}{{/isMapContainer}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}} -{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{^isListContainer}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isListContainer}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}}{{/allParams}}) +{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}} +{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}}) { list_t *localVarQueryParameters = {{#hasQueryParams}}list_create();{{/hasQueryParams}}{{^hasQueryParams}}NULL;{{/hasQueryParams}} list_t *localVarHeaderParameters = {{#hasHeaderParams}}list_create();{{/hasHeaderParams}}{{^hasHeaderParams}}NULL;{{/hasHeaderParams}} diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache index 6b2d7773d431..6271d11c1c18 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache @@ -32,7 +32,8 @@ typedef enum { {{projectName}}_{{operationId}}_{{enumName}}_NULL = 0{{#enumVars // {{/notes}} {{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMapContainer}}{{{.}}}{{/isMapContainer}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}} -{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}} ,{{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{^isListContainer}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isListContainer}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}}{{/allParams}}); +{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}} +{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}}); {{/operation}} diff --git a/samples/client/petstore/c/api/PetAPI.c b/samples/client/petstore/c/api/PetAPI.c index 5dc27c6bbf59..44069f301e0c 100644 --- a/samples/client/petstore/c/api/PetAPI.c +++ b/samples/client/petstore/c/api/PetAPI.c @@ -58,7 +58,8 @@ static openapi_petstore_findPetsByStatus_status_e findPetsByStatus_STATUS_parseF // Add a new pet to the store // void -PetAPI_addPet(apiClient_t *apiClient, pet_t * body) +PetAPI_addPet(apiClient_t *apiClient, +pet_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -117,7 +118,7 @@ PetAPI_addPet(apiClient_t *apiClient, pet_t * body) // Deletes a pet // void -PetAPI_deletePet(apiClient_t *apiClient, long petId, char * api_key) +PetAPI_deletePet(apiClient_t *apiClient, long petId , char * api_key ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = list_create(); @@ -195,7 +196,7 @@ PetAPI_deletePet(apiClient_t *apiClient, long petId, char * api_key) // Multiple status values can be provided with comma separated strings // list_t* -PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t * status) +PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t * status ) { list_t *localVarQueryParameters = list_create(); list_t *localVarHeaderParameters = NULL; @@ -274,7 +275,7 @@ PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t * status) // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. // list_t* -PetAPI_findPetsByTags(apiClient_t *apiClient, list_t * tags) +PetAPI_findPetsByTags(apiClient_t *apiClient, list_t * tags ) { list_t *localVarQueryParameters = list_create(); list_t *localVarHeaderParameters = NULL; @@ -353,7 +354,7 @@ PetAPI_findPetsByTags(apiClient_t *apiClient, list_t * tags) // Returns a single pet // pet_t* -PetAPI_getPetById(apiClient_t *apiClient, long petId) +PetAPI_getPetById(apiClient_t *apiClient, long petId ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -432,7 +433,8 @@ PetAPI_getPetById(apiClient_t *apiClient, long petId) // Update an existing pet // void -PetAPI_updatePet(apiClient_t *apiClient, pet_t * body) +PetAPI_updatePet(apiClient_t *apiClient, +pet_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -497,7 +499,7 @@ PetAPI_updatePet(apiClient_t *apiClient, pet_t * body) // Updates a pet in the store with form data // void -PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char * name, char * status) +PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId , char * name , char * status ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -589,7 +591,7 @@ PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char * name, char * // uploads an image // api_response_t* -PetAPI_uploadFile(apiClient_t *apiClient, long petId, char * additionalMetadata, binary_t* file) +PetAPI_uploadFile(apiClient_t *apiClient, long petId , char * additionalMetadata , binary_t* file ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; diff --git a/samples/client/petstore/c/api/PetAPI.h b/samples/client/petstore/c/api/PetAPI.h index b4bfc6cdf9cd..3cbeabe98951 100644 --- a/samples/client/petstore/c/api/PetAPI.h +++ b/samples/client/petstore/c/api/PetAPI.h @@ -14,13 +14,14 @@ typedef enum { openapi_petstore_findPetsByStatus_STATUS_NULL = 0, openapi_petst // Add a new pet to the store // void -PetAPI_addPet(apiClient_t *apiClient ,pet_t * body); +PetAPI_addPet(apiClient_t *apiClient, +pet_t * body ); // Deletes a pet // void -PetAPI_deletePet(apiClient_t *apiClient ,long petId ,char * api_key); +PetAPI_deletePet(apiClient_t *apiClient, long petId , char * api_key ); // Finds Pets by status @@ -28,7 +29,7 @@ PetAPI_deletePet(apiClient_t *apiClient ,long petId ,char * api_key); // Multiple status values can be provided with comma separated strings // list_t* -PetAPI_findPetsByStatus(apiClient_t *apiClient ,list_t * status); +PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t * status ); // Finds Pets by tags @@ -36,7 +37,7 @@ PetAPI_findPetsByStatus(apiClient_t *apiClient ,list_t * status); // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. // list_t* -PetAPI_findPetsByTags(apiClient_t *apiClient ,list_t * tags); +PetAPI_findPetsByTags(apiClient_t *apiClient, list_t * tags ); // Find pet by ID @@ -44,24 +45,25 @@ PetAPI_findPetsByTags(apiClient_t *apiClient ,list_t * tags); // Returns a single pet // pet_t* -PetAPI_getPetById(apiClient_t *apiClient ,long petId); +PetAPI_getPetById(apiClient_t *apiClient, long petId ); // Update an existing pet // void -PetAPI_updatePet(apiClient_t *apiClient ,pet_t * body); +PetAPI_updatePet(apiClient_t *apiClient, +pet_t * body ); // Updates a pet in the store with form data // void -PetAPI_updatePetWithForm(apiClient_t *apiClient ,long petId ,char * name ,char * status); +PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId , char * name , char * status ); // uploads an image // api_response_t* -PetAPI_uploadFile(apiClient_t *apiClient ,long petId ,char * additionalMetadata ,binary_t* file); +PetAPI_uploadFile(apiClient_t *apiClient, long petId , char * additionalMetadata , binary_t* file ); diff --git a/samples/client/petstore/c/api/StoreAPI.c b/samples/client/petstore/c/api/StoreAPI.c index d8d4778e7bea..34b6cb0bd92e 100644 --- a/samples/client/petstore/c/api/StoreAPI.c +++ b/samples/client/petstore/c/api/StoreAPI.c @@ -17,7 +17,7 @@ // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors // void -StoreAPI_deleteOrder(apiClient_t *apiClient, char * orderId) +StoreAPI_deleteOrder(apiClient_t *apiClient, char * orderId ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -139,7 +139,7 @@ StoreAPI_getInventory(apiClient_t *apiClient) // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions // order_t* -StoreAPI_getOrderById(apiClient_t *apiClient, long orderId) +StoreAPI_getOrderById(apiClient_t *apiClient, long orderId ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -218,7 +218,8 @@ StoreAPI_getOrderById(apiClient_t *apiClient, long orderId) // Place an order for a pet // order_t* -StoreAPI_placeOrder(apiClient_t *apiClient, order_t * body) +StoreAPI_placeOrder(apiClient_t *apiClient, +order_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; diff --git a/samples/client/petstore/c/api/StoreAPI.h b/samples/client/petstore/c/api/StoreAPI.h index cba13a977d55..e2927cccefd2 100644 --- a/samples/client/petstore/c/api/StoreAPI.h +++ b/samples/client/petstore/c/api/StoreAPI.h @@ -12,7 +12,7 @@ // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors // void -StoreAPI_deleteOrder(apiClient_t *apiClient ,char * orderId); +StoreAPI_deleteOrder(apiClient_t *apiClient, char * orderId ); // Returns pet inventories by status @@ -28,12 +28,13 @@ StoreAPI_getInventory(apiClient_t *apiClient); // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions // order_t* -StoreAPI_getOrderById(apiClient_t *apiClient ,long orderId); +StoreAPI_getOrderById(apiClient_t *apiClient, long orderId ); // Place an order for a pet // order_t* -StoreAPI_placeOrder(apiClient_t *apiClient ,order_t * body); +StoreAPI_placeOrder(apiClient_t *apiClient, +order_t * body ); diff --git a/samples/client/petstore/c/api/UserAPI.c b/samples/client/petstore/c/api/UserAPI.c index 2bb91981179e..788c69a2feb3 100644 --- a/samples/client/petstore/c/api/UserAPI.c +++ b/samples/client/petstore/c/api/UserAPI.c @@ -17,7 +17,8 @@ // This can only be done by the logged in user. // void -UserAPI_createUser(apiClient_t *apiClient, user_t * body) +UserAPI_createUser(apiClient_t *apiClient, +user_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -74,7 +75,7 @@ UserAPI_createUser(apiClient_t *apiClient, user_t * body) // Creates list of users with given input array // void -UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t * body) +UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -153,7 +154,7 @@ UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t * body) // Creates list of users with given input array // void -UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t * body) +UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -234,7 +235,7 @@ UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t * body) // This can only be done by the logged in user. // void -UserAPI_deleteUser(apiClient_t *apiClient, char * username) +UserAPI_deleteUser(apiClient_t *apiClient, char * username ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -294,7 +295,7 @@ UserAPI_deleteUser(apiClient_t *apiClient, char * username) // Get user by user name // user_t* -UserAPI_getUserByName(apiClient_t *apiClient, char * username) +UserAPI_getUserByName(apiClient_t *apiClient, char * username ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -369,7 +370,7 @@ UserAPI_getUserByName(apiClient_t *apiClient, char * username) // Logs user into the system // char* -UserAPI_loginUser(apiClient_t *apiClient, char * username, char * password) +UserAPI_loginUser(apiClient_t *apiClient, char * username , char * password ) { list_t *localVarQueryParameters = list_create(); list_t *localVarHeaderParameters = NULL; @@ -520,7 +521,8 @@ UserAPI_logoutUser(apiClient_t *apiClient) // This can only be done by the logged in user. // void -UserAPI_updateUser(apiClient_t *apiClient, char * username, user_t * body) +UserAPI_updateUser(apiClient_t *apiClient, char * username , +user_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; diff --git a/samples/client/petstore/c/api/UserAPI.h b/samples/client/petstore/c/api/UserAPI.h index 57f04a721940..b22b591c1960 100644 --- a/samples/client/petstore/c/api/UserAPI.h +++ b/samples/client/petstore/c/api/UserAPI.h @@ -12,19 +12,20 @@ // This can only be done by the logged in user. // void -UserAPI_createUser(apiClient_t *apiClient ,user_t * body); +UserAPI_createUser(apiClient_t *apiClient, +user_t * body ); // Creates list of users with given input array // void -UserAPI_createUsersWithArrayInput(apiClient_t *apiClient ,list_t * body); +UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t * body ); // Creates list of users with given input array // void -UserAPI_createUsersWithListInput(apiClient_t *apiClient ,list_t * body); +UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t * body ); // Delete user @@ -32,19 +33,19 @@ UserAPI_createUsersWithListInput(apiClient_t *apiClient ,list_t * body); // This can only be done by the logged in user. // void -UserAPI_deleteUser(apiClient_t *apiClient ,char * username); +UserAPI_deleteUser(apiClient_t *apiClient, char * username ); // Get user by user name // user_t* -UserAPI_getUserByName(apiClient_t *apiClient ,char * username); +UserAPI_getUserByName(apiClient_t *apiClient, char * username ); // Logs user into the system // char* -UserAPI_loginUser(apiClient_t *apiClient ,char * username ,char * password); +UserAPI_loginUser(apiClient_t *apiClient, char * username , char * password ); // Logs out current logged in user session @@ -58,6 +59,7 @@ UserAPI_logoutUser(apiClient_t *apiClient); // This can only be done by the logged in user. // void -UserAPI_updateUser(apiClient_t *apiClient ,char * username ,user_t * body); +UserAPI_updateUser(apiClient_t *apiClient, char * username , +user_t * body ); diff --git a/samples/client/petstore/c/model/pet.c b/samples/client/petstore/c/model/pet.c index 1765e45c1763..5fd6ebb2d113 100644 --- a/samples/client/petstore/c/model/pet.c +++ b/samples/client/petstore/c/model/pet.c @@ -110,6 +110,10 @@ cJSON *pet_convertToJSON(pet_t *pet) { { goto fail; } + if(cJSON_AddNumberToObject(photo_urls, "", *(double *)photo_urlsListEntry->data) == NULL) + { + goto fail; + } } From 9e032e03e463d03bd380e4c10f99e086fa34a0d4 Mon Sep 17 00:00:00 2001 From: Michele Albano Date: Thu, 19 Mar 2020 06:22:05 -0700 Subject: [PATCH 5/6] Debugging of C's modle-body.mustache, as suggested by ityuhui --- .../src/main/resources/C-libcurl/model-body.mustache | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache index c1a20b94b864..4f59107267d5 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache @@ -400,7 +400,7 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) { goto fail; } {{/isBoolean}} - {{^isNumeric}} + {{#isNumeric}} if(cJSON_AddNumberToObject({{{name}}}, "", *(double *){{{name}}}ListEntry->data) == NULL) { goto fail; @@ -451,7 +451,6 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) { } {{/isNumeric}} {{#isBoolean}} -// if(cJSON_AddBoolToObject(localMapObject, localKeyValue->key, (cJSON_bool)localKeyValue->value) == NULL) if(cJSON_AddBoolToObject(localMapObject, localKeyValue->key, *(cJSON_bool *)localKeyValue->value) == NULL) { goto fail; From 88d29cca7f7d7f68e1cf42b93d395561f03031d5 Mon Sep 17 00:00:00 2001 From: Michele Albano Date: Thu, 19 Mar 2020 07:51:09 -0700 Subject: [PATCH 6/6] Final changes suggested by ityuhui --- .../src/main/resources/C-libcurl/api-body.mustache | 3 +-- .../src/main/resources/C-libcurl/api-header.mustache | 3 +-- samples/client/petstore/c/api/PetAPI.c | 6 ++---- samples/client/petstore/c/api/PetAPI.h | 6 ++---- samples/client/petstore/c/api/StoreAPI.c | 3 +-- samples/client/petstore/c/api/StoreAPI.h | 3 +-- samples/client/petstore/c/api/UserAPI.c | 6 ++---- samples/client/petstore/c/api/UserAPI.h | 6 ++---- samples/client/petstore/c/model/pet.c | 4 ---- 9 files changed, 12 insertions(+), 28 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache index b87d5ea62f19..d2016014fad0 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache @@ -99,8 +99,7 @@ end: // {{/notes}} {{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMapContainer}}{{{.}}}{{/isMapContainer}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}} -{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}} -{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}}) +{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}}) { list_t *localVarQueryParameters = {{#hasQueryParams}}list_create();{{/hasQueryParams}}{{^hasQueryParams}}NULL;{{/hasQueryParams}} list_t *localVarHeaderParameters = {{#hasHeaderParams}}list_create();{{/hasHeaderParams}}{{^hasHeaderParams}}NULL;{{/hasHeaderParams}} diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache index 6271d11c1c18..6247c6d97dca 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache @@ -32,8 +32,7 @@ typedef enum { {{projectName}}_{{operationId}}_{{enumName}}_NULL = 0{{#enumVars // {{/notes}} {{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMapContainer}}{{{.}}}{{/isMapContainer}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}} -{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}} -{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}}); +{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}}); {{/operation}} diff --git a/samples/client/petstore/c/api/PetAPI.c b/samples/client/petstore/c/api/PetAPI.c index 44069f301e0c..e89428e9be6a 100644 --- a/samples/client/petstore/c/api/PetAPI.c +++ b/samples/client/petstore/c/api/PetAPI.c @@ -58,8 +58,7 @@ static openapi_petstore_findPetsByStatus_status_e findPetsByStatus_STATUS_parseF // Add a new pet to the store // void -PetAPI_addPet(apiClient_t *apiClient, -pet_t * body ) +PetAPI_addPet(apiClient_t *apiClient, pet_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -433,8 +432,7 @@ PetAPI_getPetById(apiClient_t *apiClient, long petId ) // Update an existing pet // void -PetAPI_updatePet(apiClient_t *apiClient, -pet_t * body ) +PetAPI_updatePet(apiClient_t *apiClient, pet_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; diff --git a/samples/client/petstore/c/api/PetAPI.h b/samples/client/petstore/c/api/PetAPI.h index 3cbeabe98951..23f8e1d92241 100644 --- a/samples/client/petstore/c/api/PetAPI.h +++ b/samples/client/petstore/c/api/PetAPI.h @@ -14,8 +14,7 @@ typedef enum { openapi_petstore_findPetsByStatus_STATUS_NULL = 0, openapi_petst // Add a new pet to the store // void -PetAPI_addPet(apiClient_t *apiClient, -pet_t * body ); +PetAPI_addPet(apiClient_t *apiClient, pet_t * body ); // Deletes a pet @@ -51,8 +50,7 @@ PetAPI_getPetById(apiClient_t *apiClient, long petId ); // Update an existing pet // void -PetAPI_updatePet(apiClient_t *apiClient, -pet_t * body ); +PetAPI_updatePet(apiClient_t *apiClient, pet_t * body ); // Updates a pet in the store with form data diff --git a/samples/client/petstore/c/api/StoreAPI.c b/samples/client/petstore/c/api/StoreAPI.c index 34b6cb0bd92e..31857ad2d190 100644 --- a/samples/client/petstore/c/api/StoreAPI.c +++ b/samples/client/petstore/c/api/StoreAPI.c @@ -218,8 +218,7 @@ StoreAPI_getOrderById(apiClient_t *apiClient, long orderId ) // Place an order for a pet // order_t* -StoreAPI_placeOrder(apiClient_t *apiClient, -order_t * body ) +StoreAPI_placeOrder(apiClient_t *apiClient, order_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; diff --git a/samples/client/petstore/c/api/StoreAPI.h b/samples/client/petstore/c/api/StoreAPI.h index e2927cccefd2..e38609bbceab 100644 --- a/samples/client/petstore/c/api/StoreAPI.h +++ b/samples/client/petstore/c/api/StoreAPI.h @@ -34,7 +34,6 @@ StoreAPI_getOrderById(apiClient_t *apiClient, long orderId ); // Place an order for a pet // order_t* -StoreAPI_placeOrder(apiClient_t *apiClient, -order_t * body ); +StoreAPI_placeOrder(apiClient_t *apiClient, order_t * body ); diff --git a/samples/client/petstore/c/api/UserAPI.c b/samples/client/petstore/c/api/UserAPI.c index 788c69a2feb3..e49c0f14bc5c 100644 --- a/samples/client/petstore/c/api/UserAPI.c +++ b/samples/client/petstore/c/api/UserAPI.c @@ -17,8 +17,7 @@ // This can only be done by the logged in user. // void -UserAPI_createUser(apiClient_t *apiClient, -user_t * body ) +UserAPI_createUser(apiClient_t *apiClient, user_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; @@ -521,8 +520,7 @@ UserAPI_logoutUser(apiClient_t *apiClient) // This can only be done by the logged in user. // void -UserAPI_updateUser(apiClient_t *apiClient, char * username , -user_t * body ) +UserAPI_updateUser(apiClient_t *apiClient, char * username , user_t * body ) { list_t *localVarQueryParameters = NULL; list_t *localVarHeaderParameters = NULL; diff --git a/samples/client/petstore/c/api/UserAPI.h b/samples/client/petstore/c/api/UserAPI.h index b22b591c1960..cc93b91b5711 100644 --- a/samples/client/petstore/c/api/UserAPI.h +++ b/samples/client/petstore/c/api/UserAPI.h @@ -12,8 +12,7 @@ // This can only be done by the logged in user. // void -UserAPI_createUser(apiClient_t *apiClient, -user_t * body ); +UserAPI_createUser(apiClient_t *apiClient, user_t * body ); // Creates list of users with given input array @@ -59,7 +58,6 @@ UserAPI_logoutUser(apiClient_t *apiClient); // This can only be done by the logged in user. // void -UserAPI_updateUser(apiClient_t *apiClient, char * username , -user_t * body ); +UserAPI_updateUser(apiClient_t *apiClient, char * username , user_t * body ); diff --git a/samples/client/petstore/c/model/pet.c b/samples/client/petstore/c/model/pet.c index 5fd6ebb2d113..1765e45c1763 100644 --- a/samples/client/petstore/c/model/pet.c +++ b/samples/client/petstore/c/model/pet.c @@ -110,10 +110,6 @@ cJSON *pet_convertToJSON(pet_t *pet) { { goto fail; } - if(cJSON_AddNumberToObject(photo_urls, "", *(double *)photo_urlsListEntry->data) == NULL) - { - goto fail; - } }