add option to fallback to non-pointe number, boolean

Author: wing328

bin/configs/c-useJsonUnformatted.yaml

@@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/c/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/C-libcurl
 additionalProperties:
   useJsonUnformatted: true
+  declareNumberBooleanWithoutPointer: true
 modelNameMappings:
   another_model: MappedModel
   another_property: mappedProperty

docs/generators/c.md

@@ -19,6 +19,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|declareNumberBooleanWithoutPointer|Declare number, boolean types without pointer using model-body, model-header templates from OpenAPI Generator v7.20.0.| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java

@@ -41,6 +41,9 @@ public class CLibcurlClientCodegen extends DefaultCodegen implements CodegenConf
     public static final String USE_JSON_UNFORMATTED = "useJsonUnformatted";
     public static final String USE_JSON_UNFORMATTED_DESC = "Use cJSON_PrintUnformatted instead of cJSON_Print when creating the JSON string.";
 
+    public static final String DECLARE_NUMBER_BOOLEAN_WITHOUT_POINTER = "declareNumberBooleanWithoutPointer";
+    public static final String DECLARE_NUMBER_BOOLEAN_WITHOUT_POINTER_DESC = "Declare number, boolean types without pointer using model-body, model-header templates from OpenAPI Generator v7.20.0.";
+
     public static final String PROJECT_NAME = "projectName";
     protected String moduleName;
     protected String projectName;
@@ -270,7 +273,6 @@ public CLibcurlClientCodegen() {
         // primitives in C lang
         languageSpecificPrimitives.add("int");
         languageSpecificPrimitives.add("short");
-        languageSpecificPrimitives.add("int");
         languageSpecificPrimitives.add("long");
         languageSpecificPrimitives.add("float");
         languageSpecificPrimitives.add("double");
@@ -315,6 +317,9 @@ public CLibcurlClientCodegen() {
 
         cliOptions.add(new CliOption(USE_JSON_UNFORMATTED, USE_JSON_UNFORMATTED_DESC).
                 defaultValue(Boolean.FALSE.toString()));
+
+        cliOptions.add(new CliOption(DECLARE_NUMBER_BOOLEAN_WITHOUT_POINTER, DECLARE_NUMBER_BOOLEAN_WITHOUT_POINTER_DESC).
+                defaultValue(Boolean.FALSE.toString()));
     }
 
     @Override
@@ -336,6 +341,13 @@ public void processOpts() {
             additionalProperties.put("cJSONPrint", "cJSON_Print");
         }
 
+        if (additionalProperties.containsKey(DECLARE_NUMBER_BOOLEAN_WITHOUT_POINTER)) {
+            if (Boolean.parseBoolean(additionalProperties.get(DECLARE_NUMBER_BOOLEAN_WITHOUT_POINTER).toString())) {
+                 modelTemplateFiles.put("model-header-v7_20_0.mustache", ".h");
+                 modelTemplateFiles.put("model-body-v7_20_0.mustache", ".c");
+             }
+        }
+
         // make api and model doc path available in mustache template
         additionalProperties.put("apiDocPath", apiDocPath);
         additionalProperties.put("modelDocPath", modelDocPath);

samples/client/petstore/c-useJsonUnformatted/.openapi-generator/FILES

@@ -31,26 +31,46 @@ include/list.h
 libcurl.licence
 model/any_type.h
 model/api_response.c
+model/api_response.c
+model/api_response.h
 model/api_response.h
 model/bit.c
+model/bit.c
 model/bit.h
+model/bit.h
+model/category.c
 model/category.c
 model/category.h
+model/category.h
+model/mapped_model.c
 model/mapped_model.c
 model/mapped_model.h
+model/mapped_model.h
 model/model_with_set_propertes.c
+model/model_with_set_propertes.c
+model/model_with_set_propertes.h
 model/model_with_set_propertes.h
 model/object.c
 model/object.h
 model/order.c
+model/order.c
+model/order.h
 model/order.h
 model/pet.c
+model/pet.c
 model/pet.h
+model/pet.h
+model/preference.c
 model/preference.c
 model/preference.h
+model/preference.h
+model/tag.c
 model/tag.c
 model/tag.h
+model/tag.h
 model/user.c
+model/user.c
+model/user.h
 model/user.h
 src/apiClient.c
 src/apiKey.c

samples/client/petstore/c-useJsonUnformatted/model/api_response.h

@@ -19,15 +19,15 @@ typedef struct api_response_t api_response_t;
 
 
 typedef struct api_response_t {
-    int *code; //numeric
+    int code; //numeric
     char *type; // string
     char *message; // string
 
     int _library_owned; // Is the library responsible for freeing this object?
 } api_response_t;
 
 __attribute__((deprecated)) api_response_t *api_response_create(
-    int *code,
+    int code,
     char *type,
     char *message
 );

samples/client/petstore/c-useJsonUnformatted/model/category.h

@@ -19,14 +19,14 @@ typedef struct category_t category_t;
 
 
 typedef struct category_t {
-    long *id; //numeric
+    long id; //numeric
     char *name; // string
 
     int _library_owned; // Is the library responsible for freeing this object?
 } category_t;
 
 __attribute__((deprecated)) category_t *category_create(
-    long *id,
+    long id,
     char *name
 );
 

samples/client/petstore/c-useJsonUnformatted/model/mapped_model.h

@@ -19,14 +19,14 @@ typedef struct MappedModel_t MappedModel_t;
 
 
 typedef struct MappedModel_t {
-    int *another_property; //numeric
+    int another_property; //numeric
     char *uuid_property; // string
 
     int _library_owned; // Is the library responsible for freeing this object?
 } MappedModel_t;
 
 __attribute__((deprecated)) MappedModel_t *MappedModel_create(
-    int *another_property,
+    int another_property,
     char *uuid_property
 );
 

samples/client/petstore/c-useJsonUnformatted/model/order.h

@@ -27,23 +27,23 @@ openapi_petstore_order_STATUS_e order_status_FromString(char* status);
 
 
 typedef struct order_t {
-    long *id; //numeric
-    long *pet_id; //numeric
-    int *quantity; //numeric
+    long id; //numeric
+    long pet_id; //numeric
+    int quantity; //numeric
     char *ship_date; //date time
     openapi_petstore_order_STATUS_e status; //enum
-    int *complete; //boolean
+    int complete; //boolean
 
     int _library_owned; // Is the library responsible for freeing this object?
 } order_t;
 
 __attribute__((deprecated)) order_t *order_create(
-    long *id,
-    long *pet_id,
-    int *quantity,
+    long id,
+    long pet_id,
+    int quantity,
     char *ship_date,
     openapi_petstore_order_STATUS_e status,
-    int *complete
+    int complete
 );
 
 void order_free(order_t *order);

samples/client/petstore/c-useJsonUnformatted/model/pet.h

@@ -29,7 +29,7 @@ openapi_petstore_pet_STATUS_e pet_status_FromString(char* status);
 
 
 typedef struct pet_t {
-    long *id; //numeric
+    long id; //numeric
     struct category_t *category; //model
     char *name; // string
     list_t *photo_urls; //primitive container
@@ -40,7 +40,7 @@ typedef struct pet_t {
 } pet_t;
 
 __attribute__((deprecated)) pet_t *pet_create(
-    long *id,
+    long id,
     category_t *category,
     char *name,
     list_t *photo_urls,

samples/client/petstore/c-useJsonUnformatted/model/tag.h

@@ -19,14 +19,14 @@ typedef struct tag_t tag_t;
 
 
 typedef struct tag_t {
-    long *id; //numeric
+    long id; //numeric
     char *name; // string
 
     int _library_owned; // Is the library responsible for freeing this object?
 } tag_t;
 
 __attribute__((deprecated)) tag_t *tag_create(
-    long *id,
+    long id,
     char *name
 );