Skip to content

Add mapping for "map" in C generator #1103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
Sep 25, 2018
Merged

Add mapping for "map" in C generator #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...api-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public CLibcurlClientCodegen() {
languageSpecificPrimitives.add("char");
languageSpecificPrimitives.add("FILE");
languageSpecificPrimitives.add("Object");
languageSpecificPrimitives.add("list_t*");

typeMapping.put("string", "char");
typeMapping.put("char", "char");
Expand All @@ -149,6 +150,7 @@ public CLibcurlClientCodegen() {
typeMapping.put("ByteArray", "char");
typeMapping.put("UUID", "char");
typeMapping.put("array", "list");
typeMapping.put("map", "list_t*");
typeMapping.put("date-time", "char");

// remove modelPackage and apiPackage added by default
Expand Down
75 changes: 57 additions & 18 deletions samples/client/petstore/C/api/PetAPI.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,18 @@ void *PetAPI_deletePet(apiClient_t *apiClient, long petId, char *api_key) {

// Path Params
char *localVarToReplace = malloc(sizeof(petId) + 3);
snprintf(localVarToReplace, strlen("petId") + 3, "%s%s%s", "{", "petId", "}");
snprintf(localVarToReplace,
strlen("petId") + 3,
"%s%s%s",
"{",
"petId",
"}");

char localVarBuff[256];
intToStr(localVarBuff, petId);

localVarPath = strReplace(localVarPath, localVarToReplace, localVarBuff);
localVarPath =
strReplace(localVarPath, localVarToReplace, localVarBuff);


// header parameters (TODO free function to implement)
Expand All @@ -89,8 +95,10 @@ void *PetAPI_deletePet(apiClient_t *apiClient, long petId, char *api_key) {
if(api_key) {
keyHeader_api_key = strdup("api_key");
valueHeader_api_key = strdup(api_key);
keyPairHeader_api_key = keyValuePair_create(keyHeader_api_key, valueHeader_api_key);
list_addElement(localVarHeaderParameters, keyPairHeader_api_key);
keyPairHeader_api_key = keyValuePair_create(keyHeader_api_key,
valueHeader_api_key);
list_addElement(localVarHeaderParameters,
keyPairHeader_api_key);
}

apiClient_invoke(apiClient,
Expand Down Expand Up @@ -263,12 +271,18 @@ pet_t *PetAPI_getPetById(apiClient_t *apiClient, long petId) {

// Path Params
char *localVarToReplace = malloc(sizeof(petId) + 3);
snprintf(localVarToReplace, strlen("petId") + 3, "%s%s%s", "{", "petId", "}");
snprintf(localVarToReplace,
strlen("petId") + 3,
"%s%s%s",
"{",
"petId",
"}");

char localVarBuff[256];
intToStr(localVarBuff, petId);

localVarPath = strReplace(localVarPath, localVarToReplace, localVarBuff);
localVarPath =
strReplace(localVarPath, localVarToReplace, localVarBuff);


list_addElement(localVarHeaderType, "application/xml"); // produces
Expand Down Expand Up @@ -349,7 +363,10 @@ void *PetAPI_updatePet(apiClient_t *apiClient, pet_t *pet) {

// Updates a pet in the store with form data
//
void *PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name, char *status) {
void *PetAPI_updatePetWithForm(apiClient_t *apiClient,
long petId,
char *name,
char *status) {
list_t *localVarQueryParameters = list_create();
list_t *localVarHeaderParameters = list_create();
list_t *localVarFormParameters = list_create();
Expand All @@ -363,12 +380,18 @@ void *PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name, c

// Path Params
char *localVarToReplace = malloc(sizeof(petId) + 3);
snprintf(localVarToReplace, strlen("petId") + 3, "%s%s%s", "{", "petId", "}");
snprintf(localVarToReplace,
strlen("petId") + 3,
"%s%s%s",
"{",
"petId",
"}");

char localVarBuff[256];
intToStr(localVarBuff, petId);

localVarPath = strReplace(localVarPath, localVarToReplace, localVarBuff);
localVarPath =
strReplace(localVarPath, localVarToReplace, localVarBuff);


// form parameters
Expand All @@ -378,7 +401,8 @@ void *PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name, c
if(name) {
keyForm_name = strdup("name");
valueForm_name = strdup(name);
keyPairForm_name = keyValuePair_create(keyForm_name, valueForm_name);
keyPairForm_name = keyValuePair_create(keyForm_name,
valueForm_name);
list_addElement(localVarFormParameters, keyPairForm_name); // String
}

Expand All @@ -389,11 +413,13 @@ void *PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name, c
if(status) {
keyForm_status = strdup("status");
valueForm_status = strdup(status);
keyPairForm_status = keyValuePair_create(keyForm_status, valueForm_status);
keyPairForm_status = keyValuePair_create(keyForm_status,
valueForm_status);
list_addElement(localVarFormParameters, keyPairForm_status); // String
}

list_addElement(localVarContentType, "application/x-www-form-urlencoded"); // consumes
list_addElement(localVarContentType,
"application/x-www-form-urlencoded"); // consumes

apiClient_invoke(apiClient,
localVarPath,
Expand Down Expand Up @@ -422,7 +448,10 @@ void *PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name, c

// uploads an image
//
api_response_t *PetAPI_uploadFile(apiClient_t *apiClient, long petId, char *additionalMetadata, FILE *file) {
api_response_t *PetAPI_uploadFile(apiClient_t *apiClient,
long petId,
char *additionalMetadata,
FILE *file) {
list_t *localVarQueryParameters = list_create();
list_t *localVarHeaderParameters = list_create();
list_t *localVarFormParameters = list_create();
Expand All @@ -436,12 +465,18 @@ api_response_t *PetAPI_uploadFile(apiClient_t *apiClient, long petId, char *addi

// Path Params
char *localVarToReplace = malloc(sizeof(petId) + 3);
snprintf(localVarToReplace, strlen("petId") + 3, "%s%s%s", "{", "petId", "}");
snprintf(localVarToReplace,
strlen("petId") + 3,
"%s%s%s",
"{",
"petId",
"}");

char localVarBuff[256];
intToStr(localVarBuff, petId);

localVarPath = strReplace(localVarPath, localVarToReplace, localVarBuff);
localVarPath =
strReplace(localVarPath, localVarToReplace, localVarBuff);


// form parameters
Expand All @@ -451,8 +486,11 @@ api_response_t *PetAPI_uploadFile(apiClient_t *apiClient, long petId, char *addi
if(additionalMetadata) {
keyForm_additionalMetadata = strdup("additionalMetadata");
valueForm_additionalMetadata = strdup(additionalMetadata);
keyPairForm_additionalMetadata = keyValuePair_create(keyForm_additionalMetadata, valueForm_additionalMetadata);
list_addElement(localVarFormParameters, keyPairForm_additionalMetadata); // String
keyPairForm_additionalMetadata = keyValuePair_create(
keyForm_additionalMetadata,
valueForm_additionalMetadata);
list_addElement(localVarFormParameters,
keyPairForm_additionalMetadata); // String
}

// form parameters
Expand Down Expand Up @@ -493,7 +531,8 @@ api_response_t *PetAPI_uploadFile(apiClient_t *apiClient, long petId, char *addi
"POST");

// nonprimitive not container
api_response_t *elementToReturn = api_response_parseFromJSON(apiClient->dataReceived);
api_response_t *elementToReturn = api_response_parseFromJSON(
apiClient->dataReceived);
if(elementToReturn == NULL) {
return 0;
}
Expand Down
10 changes: 8 additions & 2 deletions samples/client/petstore/C/api/PetAPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,15 @@ void *PetAPI_updatePet(apiClient_t *apiClient, pet_t *Pet);

// Updates a pet in the store with form data
//
void *PetAPI_updatePetWithForm(apiClient_t *apiClient, long PetId, char *Name, char *Status);
void *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, FILE *File);
api_response_t *PetAPI_uploadFile(apiClient_t *apiClient,
long PetId,
char *AdditionalMetadata,
FILE *File);
88 changes: 49 additions & 39 deletions samples/client/petstore/C/api/StoreAPI.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "apiClient.h"
#include "cJSON.h"
#include "keyValuePair.h"
//#include "map.h"
#include "order.h"

#define MAX_BUFFER_LENGTH 4096
Expand Down Expand Up @@ -32,7 +31,12 @@ void *StoreAPI_deleteOrder(apiClient_t *apiClient, char *orderId) {

// Path Params
char *localVarToReplace = malloc(sizeof(orderId) + 2);
snprintf(localVarToReplace, strlen(orderId) + 3, "%s%s%s", "{", "orderId", "}");
snprintf(localVarToReplace,
strlen(orderId) + 3,
"%s%s%s",
"{",
"orderId",
"}");

localVarPath = strReplace(localVarPath, localVarToReplace, orderId);

Expand Down Expand Up @@ -61,41 +65,41 @@ void *StoreAPI_deleteOrder(apiClient_t *apiClient, char *orderId) {
//
// Returns a map of status codes to quantities
//
//map *StoreAPI_getInventory(apiClient_t *apiClient) {
// list_t *localVarQueryParameters = list_create();
// list_t *localVarHeaderParameters = list_create();
// list_t *localVarFormParameters = list_create();
// list_t *localVarHeaderType = list_create();
// list_t *localVarContentType = list_create();
// char *localVarBodyParameters = NULL;
//
// // create the path
// char *localVarPath = malloc(MAX_BUFFER_LENGTH);
// snprintf(localVarPath, MAX_BUFFER_LENGTH, "/store/inventory");
//
// list_addElement(localVarHeaderType, "application/json"); // produces
//
// apiClient_invoke(apiClient,
// localVarPath,
// localVarQueryParameters,
// localVarHeaderParameters,
// localVarFormParameters,
// localVarHeaderType,
// localVarContentType,
// localVarBodyParameters,
// "GET");
//
// // primitive reutrn type
// char *elementToReturn = (char *) apiClient->dataReceived;
// apiClient_free(apiClient);
// list_free(localVarQueryParameters);
// list_free(localVarHeaderParameters);
// list_free(localVarFormParameters);
// list_free(localVarHeaderType);
// list_free(localVarContentType);
// free(localVarPath);
// return elementToReturn;
//}
list_t **StoreAPI_getInventory(apiClient_t *apiClient) {
list_t *localVarQueryParameters = list_create();
list_t *localVarHeaderParameters = list_create();
list_t *localVarFormParameters = list_create();
list_t *localVarHeaderType = list_create();
list_t *localVarContentType = list_create();
char *localVarBodyParameters = NULL;

// create the path
char *localVarPath = malloc(MAX_BUFFER_LENGTH);
snprintf(localVarPath, MAX_BUFFER_LENGTH, "/store/inventory");

list_addElement(localVarHeaderType, "application/json"); // produces

apiClient_invoke(apiClient,
localVarPath,
localVarQueryParameters,
localVarHeaderParameters,
localVarFormParameters,
localVarHeaderType,
localVarContentType,
localVarBodyParameters,
"GET");

// primitive reutrn type
char *elementToReturn = (char *) apiClient->dataReceived;
apiClient_free(apiClient);
list_free(localVarQueryParameters);
list_free(localVarHeaderParameters);
list_free(localVarFormParameters);
list_free(localVarHeaderType);
list_free(localVarContentType);
free(localVarPath);
return elementToReturn;
}

// Find purchase order by ID
//
Expand All @@ -115,12 +119,18 @@ order_t *StoreAPI_getOrderById(apiClient_t *apiClient, long orderId) {

// Path Params
char *localVarToReplace = malloc(sizeof(orderId) + 3);
snprintf(localVarToReplace, strlen("orderId") + 3, "%s%s%s", "{", "orderId", "}");
snprintf(localVarToReplace,
strlen("orderId") + 3,
"%s%s%s",
"{",
"orderId",
"}");

char localVarBuff[256];
intToStr(localVarBuff, orderId);

localVarPath = strReplace(localVarPath, localVarToReplace, localVarBuff);
localVarPath =
strReplace(localVarPath, localVarToReplace, localVarBuff);


list_addElement(localVarHeaderType, "application/xml"); // produces
Expand Down
3 changes: 1 addition & 2 deletions samples/client/petstore/C/api/StoreAPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include <stdio.h>
#include "apiClient.h"
#include "cJSON.h"
//#include "map.h"
#include "order.h"


Expand All @@ -17,7 +16,7 @@ void *StoreAPI_deleteOrder(apiClient_t *apiClient, char *OrderId);
//
// Returns a map of status codes to quantities
//
//map *StoreAPI_getInventory(apiClient_t *apiClient);
list_t **StoreAPI_getInventory(apiClient_t *apiClient);


// Find purchase order by ID
Expand Down
Loading