[C++][Pistache] Simplified model template - #3417

Merged
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model
Sep 29, 2019
Merged

[C++][Pistache] Simplified model template#3417
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model

Conversation

@muttleyxd

Copy link
Copy Markdown
Contributor

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

@ravinikam@stkrwork@etherealjoy@MartinDelille

Description of the PR

Well, this PR targets two issues:

  • There's a bug in current generator, if you declare a structure containing an array, then it will be declared as std::vector, which is good. But also there won't be a setter, which for me is fine, since you can get it through getter. But it doesn't set isSet variable, which means to_json function doesn't do anything useful (well it puts some members into json, but not all).
classUnsettableVector {
public:
std::vector<int32_t>& getSomeints();
// Missing setterboolsomeintsIsSet() const;
voidunsetSomeints();
}

YAML:

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integersomestring:
type: string

HelloApiImpl.cpp:

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec;
vec.setSomestring("Hello there");
vec.getSomeints().push_back(1);
vec.getSomeints().push_back(2);
vec.getSomeints().push_back(3);
nlohmann::json json;
to_json(json, vec);
response.send(Pistache::Http::Code::Ok, json.dump(4));
}

curl http://127.0.0.1:8080/there

{
"somestring": "Hello there"
} 

someints are missing

  • Second issue may not be an issue, even it may be better design, so that's a thing to discuss. I don't come from Java, so this model looks like unneeded OOP, when this model could've been a simpler struct.
    I don't know what to do with optional fields, since I wasn't able to influence current generator to generate different code (so it could omit some parameters), so currently I don't see if it does anything.
    That's why I went with simpler struct like design, which may not be right if there may be optional fields.

Anyways, this new design allows more flexible syntax, especially that we won't need to create separate json/class objects to create one object from another type.

HelloApiImpl.cpp

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, UnsettableVector{{1, 2, 3}, "Hello there"}.to_json().dump(4));
}

curl http://127.0.0.1:8080/there

{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
} 

@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model[C++][Pistache] Simplified model templateJul 22, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from ce63ce7 to 8dc01a3CompareJuly 22, 2019 11:36
@etherealjoy

Copy link
Copy Markdown
Contributor

Here we would have a problem for native types for example we serialize everything even if not set, e.g. int being zero, string being "", default or uninitialized values
Which should not be serialized, unless if explicitly set by the application.

Additionally this is a breaking change for all existing code.

@muttleyxd

muttleyxd commented Jul 24, 2019

Copy link
Copy Markdown
ContributorAuthor

You're right.

Anyways, I'd change three things in current model:

  • Add constructor which would allow setting all members with one line
  • Better from/to_json function, so we don't do C style (creating object then passing it to function)
  • Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
    • make getVectorMember() return const reference, and have separate set method
      this has a problem of creating unnecessary objects
    • make getVectorMember() return reference and implicitly set vectorMember_isSet to true
      this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
    • add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

What do you think about it?

@kuzkry

Copy link
Copy Markdown

Additionally, we may think about something resembling:

template <typename... Args>
MyResponse::MyResponse(Args... args);

and if e.g. MyResponse had 5 fields and a user gave only 3, then in return the first three would be set, the rest would not.
The flaws I can see are:

  • use of templates (for some ;)) and workarounds for the lack of fold expressions in C++11
  • forced order of member setting (I mean, the user couldn't tell to initialize last 3 elements)

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd@kuzkry
Thanks for the follow up

Add constructor which would allow setting all members with one line

For objects with lots of members, which is fairly common in REST, it is not intuitive, and default values cannot help when the members of interest are not in order

Better from/to_json function, so we don't do C style (creating object then passing it to function)

This is a good idea

Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
make getVectorMember() return const reference, and have separate set method
this has a problem of creating unnecessary objects
make getVectorMember() return reference and implicitly set vectorMember_isSet to true
this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

You could take a look at the other C++ generators for a hint, Qt5 client/server generator for example.
In general how people use it now is get the vector and start adding items. During serialization if the vector is empy then it is skipped. We could improve here.

In general, please keep in mind drastic changes which involves rework of user code are to be kept as less as possible. Inside the classes is not a problem, just we have to be careful what the user code will access.

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

Closing & Reopening to retrigger CI

@muttleyxdmuttleyxd reopened this Sep 13, 2019
@muttleyxd

muttleyxd commented Sep 13, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated PR, now it targets 5.0.x branch, as it contains breaking changes.
Non-required fields are wrapped in Pistache::Optional.

@etherealjoy@wing328

struct UnsettableVector
{
Pistache::Optional<std::vector<int32_t>> someints;
Pistache::Optional<std::string> somestring;
nlohmann::json to_json();
static nlohmann::json to_json(const UnsettableVector& o);
static UnsettableVector from_json(const nlohmann::json& j);
};
response.send(Pistache::Http::Code::Ok, UnsettableVector
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}), Pistache::Some(std::string("Hello there"))
}.to_json().dump(4));
curl http://127.0.0.1:8080/there
{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
}

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd
We can target the PR for 4.x by renaming it and then when 5.x arrives we will deprecate the current one.
Does it makes sense ?

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
Let me make sure I understood you correctly:

  • you'd want to add simplified models as new files enabled with an 'optional' flag or something?
    lets' say model-simplified-source.mustache and model-simplified-header.mustache
    for 4.x

and when 5.x arrives, we'd swap them around?

Fine by me, if that's what you meant, since I'm not sure what are your intentions with renaming it

@wing328

Copy link
Copy Markdown
Member

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

@muttleyxd
muttleyxd changed the base branch from 5.0.x to masterSeptember 20, 2019 11:49
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch 2 times, most recently from afc7fe7 to 4d68895CompareSeptember 20, 2019 12:21
@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model templateWIP: [C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 4d68895 to 59efd29CompareSeptember 20, 2019 19:46
@muttleyxdmuttleyxd changed the title WIP: [C++][Pistache] Simplified model template[C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

Thank you for your tips.

Some changes to models & Java code. Please check if they're ok (I don't usually write Java, so I might have done something wrong).

So now model consists of:

struct struct_name {
Pistache::Optional<type> optional_field;
type required_field;
nlohmann::json to_json();
static struct_name from_json(nlohmann::json);
};
void to_json(nlohmann::json &j, struct_name const& o);
void from_json(nlohmann::json const &j, struct_name &o);

The last two methods are required for nlohmann::json.get_to() method to work, hence they are not members of model.
I've tested code it generates, it seems to work both when request is a model or when request is parsed/outputted from/to nlohmann::json.

Calling @etherealjoy since I've done changes I wanted.

@etherealjoy

Copy link
Copy Markdown
Contributor

Interesting, It looks fine for me.
I will try it and give some feedback

@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 59efd29 to 10690f5CompareSeptember 23, 2019 10:49
@muttleyxd

muttleyxd commented Sep 23, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated the PR, I removed some unnecessary code from to_json and from_json methods (as we don't need specific code for model members).

@etherealjoy

Interesting, It looks fine for me.
I will try it and give some feedback

You can play around with UnsettableVector (name comes from old & fixed bug in Pistache's generator), it's a nice and short showcase (well, it lacks required arguments)

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"post:
requestBody:
description: json to deserialize then serializerequired: truecontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"operationId: helloTherePosttags:
- hellosummary: Do something (receive)responses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integermember:
$ref: '#/components/schemas/VectorMember'strmem:
type: stringVectorMember:
type: objectproperties:
number:
type: integertext:
type: string

handlers (HelloApiImpl.cpp)

voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}),
Pistache::Some(VectorMember
{
Pistache::Some(123),
Pistache::None()
}),
Pistache::Some(std::string("hello there"))
};
response.send(Pistache::Http::Code::Ok, vec.to_json().dump());
}
voidHelloApiImpl::hello_there_post(const UnsettableVector &unsettableVector, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, unsettableVector.to_json().dump());
}
curl -s http://127.0.0.1:8080/there
curl -s http://127.0.0.1:8080/there -X POST -d '{"member":{"number":123},"someints":[1,2,3],"strmem":"hello there"}'

it nicely outputs and parses incoming UnsettableVector.

@etherealjoy

Copy link
Copy Markdown
Contributor

This new change is very interesting. Makes it a lot simpler when handling objects.
Did you have a chance to check out this issue #2769
I have not been able to not wrap my around to solving it. I think with this approach it could be solvable.

@etherealjoyetherealjoy added this to the 4.1.3 milestone Sep 29, 2019
@etherealjoy
etherealjoy merged commit 8212e80 into OpenAPITools:masterSep 29, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
I'll take a look at mentioned issue on Monday.

jimschubert added a commit that referenced this pull request Sep 30, 2019
* master: (207 commits)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
[python-experimental] generate model if type != object if enums/validations exist (#2757)
[scala] add [date-time] field to codegen unit test (#3939)
...
Jesse0Michael pushed a commit to Jesse0Michael/openapi-generator that referenced this pull request Oct 3, 2019
* [C++][Pistache] Simplified model template
* [C++][Pistache] Fix for addExternalLibs option
CMake would fail with addExternalLibs set to false
since it'd try to add depenency to not-existing targets
* [C++][Pistache] Update cpp-pistache-server-petstore.sh
* [C++][Pistache] Update Petstore sample
* [C++][Pistache] Update documentation
jimschubert added a commit that referenced this pull request Oct 4, 2019
* master: (110 commits)
[golang] Regenerate all go samples (#3988)
Better tests for string (number) (#3953)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
...
@wing328

Copy link
Copy Markdown
Member

@muttleyxd thanks for the PR, which has been included in the v4.1.3 release: https://twitter.com/oas_generator/status/1180123829626003456

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@muttleyxd@etherealjoy@kuzkry@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[C++][Pistache] Simplified model template - #3417

Merged
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model
Sep 29, 2019
Merged

[C++][Pistache] Simplified model template#3417
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model

Conversation

@muttleyxd

Copy link
Copy Markdown
Contributor

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

@ravinikam@stkrwork@etherealjoy@MartinDelille

Description of the PR

Well, this PR targets two issues:

  • There's a bug in current generator, if you declare a structure containing an array, then it will be declared as std::vector, which is good. But also there won't be a setter, which for me is fine, since you can get it through getter. But it doesn't set isSet variable, which means to_json function doesn't do anything useful (well it puts some members into json, but not all).
classUnsettableVector {
public:
std::vector<int32_t>& getSomeints();
// Missing setterboolsomeintsIsSet() const;
voidunsetSomeints();
}

YAML:

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integersomestring:
type: string

HelloApiImpl.cpp:

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec;
vec.setSomestring("Hello there");
vec.getSomeints().push_back(1);
vec.getSomeints().push_back(2);
vec.getSomeints().push_back(3);
nlohmann::json json;
to_json(json, vec);
response.send(Pistache::Http::Code::Ok, json.dump(4));
}

curl http://127.0.0.1:8080/there

{
"somestring": "Hello there"
} 

someints are missing

  • Second issue may not be an issue, even it may be better design, so that's a thing to discuss. I don't come from Java, so this model looks like unneeded OOP, when this model could've been a simpler struct.
    I don't know what to do with optional fields, since I wasn't able to influence current generator to generate different code (so it could omit some parameters), so currently I don't see if it does anything.
    That's why I went with simpler struct like design, which may not be right if there may be optional fields.

Anyways, this new design allows more flexible syntax, especially that we won't need to create separate json/class objects to create one object from another type.

HelloApiImpl.cpp

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, UnsettableVector{{1, 2, 3}, "Hello there"}.to_json().dump(4));
}

curl http://127.0.0.1:8080/there

{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
} 

@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model[C++][Pistache] Simplified model templateJul 22, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from ce63ce7 to 8dc01a3CompareJuly 22, 2019 11:36
@etherealjoy

Copy link
Copy Markdown
Contributor

Here we would have a problem for native types for example we serialize everything even if not set, e.g. int being zero, string being "", default or uninitialized values
Which should not be serialized, unless if explicitly set by the application.

Additionally this is a breaking change for all existing code.

@muttleyxd

muttleyxd commented Jul 24, 2019

Copy link
Copy Markdown
ContributorAuthor

You're right.

Anyways, I'd change three things in current model:

  • Add constructor which would allow setting all members with one line
  • Better from/to_json function, so we don't do C style (creating object then passing it to function)
  • Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
    • make getVectorMember() return const reference, and have separate set method
      this has a problem of creating unnecessary objects
    • make getVectorMember() return reference and implicitly set vectorMember_isSet to true
      this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
    • add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

What do you think about it?

@kuzkry

Copy link
Copy Markdown

Additionally, we may think about something resembling:

template <typename... Args>
MyResponse::MyResponse(Args... args);

and if e.g. MyResponse had 5 fields and a user gave only 3, then in return the first three would be set, the rest would not.
The flaws I can see are:

  • use of templates (for some ;)) and workarounds for the lack of fold expressions in C++11
  • forced order of member setting (I mean, the user couldn't tell to initialize last 3 elements)

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd@kuzkry
Thanks for the follow up

Add constructor which would allow setting all members with one line

For objects with lots of members, which is fairly common in REST, it is not intuitive, and default values cannot help when the members of interest are not in order

Better from/to_json function, so we don't do C style (creating object then passing it to function)

This is a good idea

Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
make getVectorMember() return const reference, and have separate set method
this has a problem of creating unnecessary objects
make getVectorMember() return reference and implicitly set vectorMember_isSet to true
this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

You could take a look at the other C++ generators for a hint, Qt5 client/server generator for example.
In general how people use it now is get the vector and start adding items. During serialization if the vector is empy then it is skipped. We could improve here.

In general, please keep in mind drastic changes which involves rework of user code are to be kept as less as possible. Inside the classes is not a problem, just we have to be careful what the user code will access.

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

Closing & Reopening to retrigger CI

@muttleyxdmuttleyxd reopened this Sep 13, 2019
@muttleyxd

muttleyxd commented Sep 13, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated PR, now it targets 5.0.x branch, as it contains breaking changes.
Non-required fields are wrapped in Pistache::Optional.

@etherealjoy@wing328

struct UnsettableVector
{
Pistache::Optional<std::vector<int32_t>> someints;
Pistache::Optional<std::string> somestring;
nlohmann::json to_json();
static nlohmann::json to_json(const UnsettableVector& o);
static UnsettableVector from_json(const nlohmann::json& j);
};
response.send(Pistache::Http::Code::Ok, UnsettableVector
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}), Pistache::Some(std::string("Hello there"))
}.to_json().dump(4));
curl http://127.0.0.1:8080/there
{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
}

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd
We can target the PR for 4.x by renaming it and then when 5.x arrives we will deprecate the current one.
Does it makes sense ?

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
Let me make sure I understood you correctly:

  • you'd want to add simplified models as new files enabled with an 'optional' flag or something?
    lets' say model-simplified-source.mustache and model-simplified-header.mustache
    for 4.x

and when 5.x arrives, we'd swap them around?

Fine by me, if that's what you meant, since I'm not sure what are your intentions with renaming it

@wing328

Copy link
Copy Markdown
Member

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

@muttleyxd
muttleyxd changed the base branch from 5.0.x to masterSeptember 20, 2019 11:49
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch 2 times, most recently from afc7fe7 to 4d68895CompareSeptember 20, 2019 12:21
@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model templateWIP: [C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 4d68895 to 59efd29CompareSeptember 20, 2019 19:46
@muttleyxdmuttleyxd changed the title WIP: [C++][Pistache] Simplified model template[C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

Thank you for your tips.

Some changes to models & Java code. Please check if they're ok (I don't usually write Java, so I might have done something wrong).

So now model consists of:

struct struct_name {
Pistache::Optional<type> optional_field;
type required_field;
nlohmann::json to_json();
static struct_name from_json(nlohmann::json);
};
void to_json(nlohmann::json &j, struct_name const& o);
void from_json(nlohmann::json const &j, struct_name &o);

The last two methods are required for nlohmann::json.get_to() method to work, hence they are not members of model.
I've tested code it generates, it seems to work both when request is a model or when request is parsed/outputted from/to nlohmann::json.

Calling @etherealjoy since I've done changes I wanted.

@etherealjoy

Copy link
Copy Markdown
Contributor

Interesting, It looks fine for me.
I will try it and give some feedback

@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 59efd29 to 10690f5CompareSeptember 23, 2019 10:49
@muttleyxd

muttleyxd commented Sep 23, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated the PR, I removed some unnecessary code from to_json and from_json methods (as we don't need specific code for model members).

@etherealjoy

Interesting, It looks fine for me.
I will try it and give some feedback

You can play around with UnsettableVector (name comes from old & fixed bug in Pistache's generator), it's a nice and short showcase (well, it lacks required arguments)

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"post:
requestBody:
description: json to deserialize then serializerequired: truecontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"operationId: helloTherePosttags:
- hellosummary: Do something (receive)responses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integermember:
$ref: '#/components/schemas/VectorMember'strmem:
type: stringVectorMember:
type: objectproperties:
number:
type: integertext:
type: string

handlers (HelloApiImpl.cpp)

voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}),
Pistache::Some(VectorMember
{
Pistache::Some(123),
Pistache::None()
}),
Pistache::Some(std::string("hello there"))
};
response.send(Pistache::Http::Code::Ok, vec.to_json().dump());
}
voidHelloApiImpl::hello_there_post(const UnsettableVector &unsettableVector, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, unsettableVector.to_json().dump());
}
curl -s http://127.0.0.1:8080/there
curl -s http://127.0.0.1:8080/there -X POST -d '{"member":{"number":123},"someints":[1,2,3],"strmem":"hello there"}'

it nicely outputs and parses incoming UnsettableVector.

@etherealjoy

Copy link
Copy Markdown
Contributor

This new change is very interesting. Makes it a lot simpler when handling objects.
Did you have a chance to check out this issue #2769
I have not been able to not wrap my around to solving it. I think with this approach it could be solvable.

@etherealjoyetherealjoy added this to the 4.1.3 milestone Sep 29, 2019
@etherealjoy
etherealjoy merged commit 8212e80 into OpenAPITools:masterSep 29, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
I'll take a look at mentioned issue on Monday.

jimschubert added a commit that referenced this pull request Sep 30, 2019
* master: (207 commits)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
[python-experimental] generate model if type != object if enums/validations exist (#2757)
[scala] add [date-time] field to codegen unit test (#3939)
...
Jesse0Michael pushed a commit to Jesse0Michael/openapi-generator that referenced this pull request Oct 3, 2019
* [C++][Pistache] Simplified model template
* [C++][Pistache] Fix for addExternalLibs option
CMake would fail with addExternalLibs set to false
since it'd try to add depenency to not-existing targets
* [C++][Pistache] Update cpp-pistache-server-petstore.sh
* [C++][Pistache] Update Petstore sample
* [C++][Pistache] Update documentation
jimschubert added a commit that referenced this pull request Oct 4, 2019
* master: (110 commits)
[golang] Regenerate all go samples (#3988)
Better tests for string (number) (#3953)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
...
@wing328

Copy link
Copy Markdown
Member

@muttleyxd thanks for the PR, which has been included in the v4.1.3 release: https://twitter.com/oas_generator/status/1180123829626003456

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@muttleyxd@etherealjoy@kuzkry@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[C++][Pistache] Simplified model template - #3417

Merged
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model
Sep 29, 2019
Merged

[C++][Pistache] Simplified model template#3417
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model

Conversation

@muttleyxd

Copy link
Copy Markdown
Contributor

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

@ravinikam@stkrwork@etherealjoy@MartinDelille

Description of the PR

Well, this PR targets two issues:

  • There's a bug in current generator, if you declare a structure containing an array, then it will be declared as std::vector, which is good. But also there won't be a setter, which for me is fine, since you can get it through getter. But it doesn't set isSet variable, which means to_json function doesn't do anything useful (well it puts some members into json, but not all).
classUnsettableVector {
public:
std::vector<int32_t>& getSomeints();
// Missing setterboolsomeintsIsSet() const;
voidunsetSomeints();
}

YAML:

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integersomestring:
type: string

HelloApiImpl.cpp:

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec;
vec.setSomestring("Hello there");
vec.getSomeints().push_back(1);
vec.getSomeints().push_back(2);
vec.getSomeints().push_back(3);
nlohmann::json json;
to_json(json, vec);
response.send(Pistache::Http::Code::Ok, json.dump(4));
}

curl http://127.0.0.1:8080/there

{
"somestring": "Hello there"
} 

someints are missing

  • Second issue may not be an issue, even it may be better design, so that's a thing to discuss. I don't come from Java, so this model looks like unneeded OOP, when this model could've been a simpler struct.
    I don't know what to do with optional fields, since I wasn't able to influence current generator to generate different code (so it could omit some parameters), so currently I don't see if it does anything.
    That's why I went with simpler struct like design, which may not be right if there may be optional fields.

Anyways, this new design allows more flexible syntax, especially that we won't need to create separate json/class objects to create one object from another type.

HelloApiImpl.cpp

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, UnsettableVector{{1, 2, 3}, "Hello there"}.to_json().dump(4));
}

curl http://127.0.0.1:8080/there

{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
} 

@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model[C++][Pistache] Simplified model templateJul 22, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from ce63ce7 to 8dc01a3CompareJuly 22, 2019 11:36
@etherealjoy

Copy link
Copy Markdown
Contributor

Here we would have a problem for native types for example we serialize everything even if not set, e.g. int being zero, string being "", default or uninitialized values
Which should not be serialized, unless if explicitly set by the application.

Additionally this is a breaking change for all existing code.

@muttleyxd

muttleyxd commented Jul 24, 2019

Copy link
Copy Markdown
ContributorAuthor

You're right.

Anyways, I'd change three things in current model:

  • Add constructor which would allow setting all members with one line
  • Better from/to_json function, so we don't do C style (creating object then passing it to function)
  • Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
    • make getVectorMember() return const reference, and have separate set method
      this has a problem of creating unnecessary objects
    • make getVectorMember() return reference and implicitly set vectorMember_isSet to true
      this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
    • add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

What do you think about it?

@kuzkry

Copy link
Copy Markdown

Additionally, we may think about something resembling:

template <typename... Args>
MyResponse::MyResponse(Args... args);

and if e.g. MyResponse had 5 fields and a user gave only 3, then in return the first three would be set, the rest would not.
The flaws I can see are:

  • use of templates (for some ;)) and workarounds for the lack of fold expressions in C++11
  • forced order of member setting (I mean, the user couldn't tell to initialize last 3 elements)

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd@kuzkry
Thanks for the follow up

Add constructor which would allow setting all members with one line

For objects with lots of members, which is fairly common in REST, it is not intuitive, and default values cannot help when the members of interest are not in order

Better from/to_json function, so we don't do C style (creating object then passing it to function)

This is a good idea

Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
make getVectorMember() return const reference, and have separate set method
this has a problem of creating unnecessary objects
make getVectorMember() return reference and implicitly set vectorMember_isSet to true
this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

You could take a look at the other C++ generators for a hint, Qt5 client/server generator for example.
In general how people use it now is get the vector and start adding items. During serialization if the vector is empy then it is skipped. We could improve here.

In general, please keep in mind drastic changes which involves rework of user code are to be kept as less as possible. Inside the classes is not a problem, just we have to be careful what the user code will access.

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

Closing & Reopening to retrigger CI

@muttleyxdmuttleyxd reopened this Sep 13, 2019
@muttleyxd

muttleyxd commented Sep 13, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated PR, now it targets 5.0.x branch, as it contains breaking changes.
Non-required fields are wrapped in Pistache::Optional.

@etherealjoy@wing328

struct UnsettableVector
{
Pistache::Optional<std::vector<int32_t>> someints;
Pistache::Optional<std::string> somestring;
nlohmann::json to_json();
static nlohmann::json to_json(const UnsettableVector& o);
static UnsettableVector from_json(const nlohmann::json& j);
};
response.send(Pistache::Http::Code::Ok, UnsettableVector
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}), Pistache::Some(std::string("Hello there"))
}.to_json().dump(4));
curl http://127.0.0.1:8080/there
{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
}

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd
We can target the PR for 4.x by renaming it and then when 5.x arrives we will deprecate the current one.
Does it makes sense ?

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
Let me make sure I understood you correctly:

  • you'd want to add simplified models as new files enabled with an 'optional' flag or something?
    lets' say model-simplified-source.mustache and model-simplified-header.mustache
    for 4.x

and when 5.x arrives, we'd swap them around?

Fine by me, if that's what you meant, since I'm not sure what are your intentions with renaming it

@wing328

Copy link
Copy Markdown
Member

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

@muttleyxd
muttleyxd changed the base branch from 5.0.x to masterSeptember 20, 2019 11:49
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch 2 times, most recently from afc7fe7 to 4d68895CompareSeptember 20, 2019 12:21
@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model templateWIP: [C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 4d68895 to 59efd29CompareSeptember 20, 2019 19:46
@muttleyxdmuttleyxd changed the title WIP: [C++][Pistache] Simplified model template[C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

Thank you for your tips.

Some changes to models & Java code. Please check if they're ok (I don't usually write Java, so I might have done something wrong).

So now model consists of:

struct struct_name {
Pistache::Optional<type> optional_field;
type required_field;
nlohmann::json to_json();
static struct_name from_json(nlohmann::json);
};
void to_json(nlohmann::json &j, struct_name const& o);
void from_json(nlohmann::json const &j, struct_name &o);

The last two methods are required for nlohmann::json.get_to() method to work, hence they are not members of model.
I've tested code it generates, it seems to work both when request is a model or when request is parsed/outputted from/to nlohmann::json.

Calling @etherealjoy since I've done changes I wanted.

@etherealjoy

Copy link
Copy Markdown
Contributor

Interesting, It looks fine for me.
I will try it and give some feedback

@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 59efd29 to 10690f5CompareSeptember 23, 2019 10:49
@muttleyxd

muttleyxd commented Sep 23, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated the PR, I removed some unnecessary code from to_json and from_json methods (as we don't need specific code for model members).

@etherealjoy

Interesting, It looks fine for me.
I will try it and give some feedback

You can play around with UnsettableVector (name comes from old & fixed bug in Pistache's generator), it's a nice and short showcase (well, it lacks required arguments)

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"post:
requestBody:
description: json to deserialize then serializerequired: truecontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"operationId: helloTherePosttags:
- hellosummary: Do something (receive)responses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integermember:
$ref: '#/components/schemas/VectorMember'strmem:
type: stringVectorMember:
type: objectproperties:
number:
type: integertext:
type: string

handlers (HelloApiImpl.cpp)

voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}),
Pistache::Some(VectorMember
{
Pistache::Some(123),
Pistache::None()
}),
Pistache::Some(std::string("hello there"))
};
response.send(Pistache::Http::Code::Ok, vec.to_json().dump());
}
voidHelloApiImpl::hello_there_post(const UnsettableVector &unsettableVector, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, unsettableVector.to_json().dump());
}
curl -s http://127.0.0.1:8080/there
curl -s http://127.0.0.1:8080/there -X POST -d '{"member":{"number":123},"someints":[1,2,3],"strmem":"hello there"}'

it nicely outputs and parses incoming UnsettableVector.

@etherealjoy

Copy link
Copy Markdown
Contributor

This new change is very interesting. Makes it a lot simpler when handling objects.
Did you have a chance to check out this issue #2769
I have not been able to not wrap my around to solving it. I think with this approach it could be solvable.

@etherealjoyetherealjoy added this to the 4.1.3 milestone Sep 29, 2019
@etherealjoy
etherealjoy merged commit 8212e80 into OpenAPITools:masterSep 29, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
I'll take a look at mentioned issue on Monday.

jimschubert added a commit that referenced this pull request Sep 30, 2019
* master: (207 commits)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
[python-experimental] generate model if type != object if enums/validations exist (#2757)
[scala] add [date-time] field to codegen unit test (#3939)
...
Jesse0Michael pushed a commit to Jesse0Michael/openapi-generator that referenced this pull request Oct 3, 2019
* [C++][Pistache] Simplified model template
* [C++][Pistache] Fix for addExternalLibs option
CMake would fail with addExternalLibs set to false
since it'd try to add depenency to not-existing targets
* [C++][Pistache] Update cpp-pistache-server-petstore.sh
* [C++][Pistache] Update Petstore sample
* [C++][Pistache] Update documentation
jimschubert added a commit that referenced this pull request Oct 4, 2019
* master: (110 commits)
[golang] Regenerate all go samples (#3988)
Better tests for string (number) (#3953)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
...
@wing328

Copy link
Copy Markdown
Member

@muttleyxd thanks for the PR, which has been included in the v4.1.3 release: https://twitter.com/oas_generator/status/1180123829626003456

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@muttleyxd@etherealjoy@kuzkry@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[C++][Pistache] Simplified model template - #3417

Merged
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model
Sep 29, 2019
Merged

[C++][Pistache] Simplified model template#3417
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model

Conversation

@muttleyxd

Copy link
Copy Markdown
Contributor

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

@ravinikam@stkrwork@etherealjoy@MartinDelille

Description of the PR

Well, this PR targets two issues:

  • There's a bug in current generator, if you declare a structure containing an array, then it will be declared as std::vector, which is good. But also there won't be a setter, which for me is fine, since you can get it through getter. But it doesn't set isSet variable, which means to_json function doesn't do anything useful (well it puts some members into json, but not all).
classUnsettableVector {
public:
std::vector<int32_t>& getSomeints();
// Missing setterboolsomeintsIsSet() const;
voidunsetSomeints();
}

YAML:

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integersomestring:
type: string

HelloApiImpl.cpp:

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec;
vec.setSomestring("Hello there");
vec.getSomeints().push_back(1);
vec.getSomeints().push_back(2);
vec.getSomeints().push_back(3);
nlohmann::json json;
to_json(json, vec);
response.send(Pistache::Http::Code::Ok, json.dump(4));
}

curl http://127.0.0.1:8080/there

{
"somestring": "Hello there"
} 

someints are missing

  • Second issue may not be an issue, even it may be better design, so that's a thing to discuss. I don't come from Java, so this model looks like unneeded OOP, when this model could've been a simpler struct.
    I don't know what to do with optional fields, since I wasn't able to influence current generator to generate different code (so it could omit some parameters), so currently I don't see if it does anything.
    That's why I went with simpler struct like design, which may not be right if there may be optional fields.

Anyways, this new design allows more flexible syntax, especially that we won't need to create separate json/class objects to create one object from another type.

HelloApiImpl.cpp

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, UnsettableVector{{1, 2, 3}, "Hello there"}.to_json().dump(4));
}

curl http://127.0.0.1:8080/there

{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
} 

@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model[C++][Pistache] Simplified model templateJul 22, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from ce63ce7 to 8dc01a3CompareJuly 22, 2019 11:36
@etherealjoy

Copy link
Copy Markdown
Contributor

Here we would have a problem for native types for example we serialize everything even if not set, e.g. int being zero, string being "", default or uninitialized values
Which should not be serialized, unless if explicitly set by the application.

Additionally this is a breaking change for all existing code.

@muttleyxd

muttleyxd commented Jul 24, 2019

Copy link
Copy Markdown
ContributorAuthor

You're right.

Anyways, I'd change three things in current model:

  • Add constructor which would allow setting all members with one line
  • Better from/to_json function, so we don't do C style (creating object then passing it to function)
  • Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
    • make getVectorMember() return const reference, and have separate set method
      this has a problem of creating unnecessary objects
    • make getVectorMember() return reference and implicitly set vectorMember_isSet to true
      this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
    • add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

What do you think about it?

@kuzkry

Copy link
Copy Markdown

Additionally, we may think about something resembling:

template <typename... Args>
MyResponse::MyResponse(Args... args);

and if e.g. MyResponse had 5 fields and a user gave only 3, then in return the first three would be set, the rest would not.
The flaws I can see are:

  • use of templates (for some ;)) and workarounds for the lack of fold expressions in C++11
  • forced order of member setting (I mean, the user couldn't tell to initialize last 3 elements)

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd@kuzkry
Thanks for the follow up

Add constructor which would allow setting all members with one line

For objects with lots of members, which is fairly common in REST, it is not intuitive, and default values cannot help when the members of interest are not in order

Better from/to_json function, so we don't do C style (creating object then passing it to function)

This is a good idea

Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
make getVectorMember() return const reference, and have separate set method
this has a problem of creating unnecessary objects
make getVectorMember() return reference and implicitly set vectorMember_isSet to true
this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

You could take a look at the other C++ generators for a hint, Qt5 client/server generator for example.
In general how people use it now is get the vector and start adding items. During serialization if the vector is empy then it is skipped. We could improve here.

In general, please keep in mind drastic changes which involves rework of user code are to be kept as less as possible. Inside the classes is not a problem, just we have to be careful what the user code will access.

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

Closing & Reopening to retrigger CI

@muttleyxdmuttleyxd reopened this Sep 13, 2019
@muttleyxd

muttleyxd commented Sep 13, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated PR, now it targets 5.0.x branch, as it contains breaking changes.
Non-required fields are wrapped in Pistache::Optional.

@etherealjoy@wing328

struct UnsettableVector
{
Pistache::Optional<std::vector<int32_t>> someints;
Pistache::Optional<std::string> somestring;
nlohmann::json to_json();
static nlohmann::json to_json(const UnsettableVector& o);
static UnsettableVector from_json(const nlohmann::json& j);
};
response.send(Pistache::Http::Code::Ok, UnsettableVector
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}), Pistache::Some(std::string("Hello there"))
}.to_json().dump(4));
curl http://127.0.0.1:8080/there
{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
}

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd
We can target the PR for 4.x by renaming it and then when 5.x arrives we will deprecate the current one.
Does it makes sense ?

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
Let me make sure I understood you correctly:

  • you'd want to add simplified models as new files enabled with an 'optional' flag or something?
    lets' say model-simplified-source.mustache and model-simplified-header.mustache
    for 4.x

and when 5.x arrives, we'd swap them around?

Fine by me, if that's what you meant, since I'm not sure what are your intentions with renaming it

@wing328

Copy link
Copy Markdown
Member

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

@muttleyxd
muttleyxd changed the base branch from 5.0.x to masterSeptember 20, 2019 11:49
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch 2 times, most recently from afc7fe7 to 4d68895CompareSeptember 20, 2019 12:21
@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model templateWIP: [C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 4d68895 to 59efd29CompareSeptember 20, 2019 19:46
@muttleyxdmuttleyxd changed the title WIP: [C++][Pistache] Simplified model template[C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

Thank you for your tips.

Some changes to models & Java code. Please check if they're ok (I don't usually write Java, so I might have done something wrong).

So now model consists of:

struct struct_name {
Pistache::Optional<type> optional_field;
type required_field;
nlohmann::json to_json();
static struct_name from_json(nlohmann::json);
};
void to_json(nlohmann::json &j, struct_name const& o);
void from_json(nlohmann::json const &j, struct_name &o);

The last two methods are required for nlohmann::json.get_to() method to work, hence they are not members of model.
I've tested code it generates, it seems to work both when request is a model or when request is parsed/outputted from/to nlohmann::json.

Calling @etherealjoy since I've done changes I wanted.

@etherealjoy

Copy link
Copy Markdown
Contributor

Interesting, It looks fine for me.
I will try it and give some feedback

@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 59efd29 to 10690f5CompareSeptember 23, 2019 10:49
@muttleyxd

muttleyxd commented Sep 23, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated the PR, I removed some unnecessary code from to_json and from_json methods (as we don't need specific code for model members).

@etherealjoy

Interesting, It looks fine for me.
I will try it and give some feedback

You can play around with UnsettableVector (name comes from old & fixed bug in Pistache's generator), it's a nice and short showcase (well, it lacks required arguments)

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"post:
requestBody:
description: json to deserialize then serializerequired: truecontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"operationId: helloTherePosttags:
- hellosummary: Do something (receive)responses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integermember:
$ref: '#/components/schemas/VectorMember'strmem:
type: stringVectorMember:
type: objectproperties:
number:
type: integertext:
type: string

handlers (HelloApiImpl.cpp)

voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}),
Pistache::Some(VectorMember
{
Pistache::Some(123),
Pistache::None()
}),
Pistache::Some(std::string("hello there"))
};
response.send(Pistache::Http::Code::Ok, vec.to_json().dump());
}
voidHelloApiImpl::hello_there_post(const UnsettableVector &unsettableVector, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, unsettableVector.to_json().dump());
}
curl -s http://127.0.0.1:8080/there
curl -s http://127.0.0.1:8080/there -X POST -d '{"member":{"number":123},"someints":[1,2,3],"strmem":"hello there"}'

it nicely outputs and parses incoming UnsettableVector.

@etherealjoy

Copy link
Copy Markdown
Contributor

This new change is very interesting. Makes it a lot simpler when handling objects.
Did you have a chance to check out this issue #2769
I have not been able to not wrap my around to solving it. I think with this approach it could be solvable.

@etherealjoyetherealjoy added this to the 4.1.3 milestone Sep 29, 2019
@etherealjoy
etherealjoy merged commit 8212e80 into OpenAPITools:masterSep 29, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
I'll take a look at mentioned issue on Monday.

jimschubert added a commit that referenced this pull request Sep 30, 2019
* master: (207 commits)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
[python-experimental] generate model if type != object if enums/validations exist (#2757)
[scala] add [date-time] field to codegen unit test (#3939)
...
Jesse0Michael pushed a commit to Jesse0Michael/openapi-generator that referenced this pull request Oct 3, 2019
* [C++][Pistache] Simplified model template
* [C++][Pistache] Fix for addExternalLibs option
CMake would fail with addExternalLibs set to false
since it'd try to add depenency to not-existing targets
* [C++][Pistache] Update cpp-pistache-server-petstore.sh
* [C++][Pistache] Update Petstore sample
* [C++][Pistache] Update documentation
jimschubert added a commit that referenced this pull request Oct 4, 2019
* master: (110 commits)
[golang] Regenerate all go samples (#3988)
Better tests for string (number) (#3953)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
...
@wing328

Copy link
Copy Markdown
Member

@muttleyxd thanks for the PR, which has been included in the v4.1.3 release: https://twitter.com/oas_generator/status/1180123829626003456

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@muttleyxd@etherealjoy@kuzkry@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[C++][Pistache] Simplified model template - #3417

Merged
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model
Sep 29, 2019
Merged

[C++][Pistache] Simplified model template#3417
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model

Conversation

@muttleyxd

Copy link
Copy Markdown
Contributor

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

@ravinikam@stkrwork@etherealjoy@MartinDelille

Description of the PR

Well, this PR targets two issues:

  • There's a bug in current generator, if you declare a structure containing an array, then it will be declared as std::vector, which is good. But also there won't be a setter, which for me is fine, since you can get it through getter. But it doesn't set isSet variable, which means to_json function doesn't do anything useful (well it puts some members into json, but not all).
classUnsettableVector {
public:
std::vector<int32_t>& getSomeints();
// Missing setterboolsomeintsIsSet() const;
voidunsetSomeints();
}

YAML:

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integersomestring:
type: string

HelloApiImpl.cpp:

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec;
vec.setSomestring("Hello there");
vec.getSomeints().push_back(1);
vec.getSomeints().push_back(2);
vec.getSomeints().push_back(3);
nlohmann::json json;
to_json(json, vec);
response.send(Pistache::Http::Code::Ok, json.dump(4));
}

curl http://127.0.0.1:8080/there

{
"somestring": "Hello there"
} 

someints are missing

  • Second issue may not be an issue, even it may be better design, so that's a thing to discuss. I don't come from Java, so this model looks like unneeded OOP, when this model could've been a simpler struct.
    I don't know what to do with optional fields, since I wasn't able to influence current generator to generate different code (so it could omit some parameters), so currently I don't see if it does anything.
    That's why I went with simpler struct like design, which may not be right if there may be optional fields.

Anyways, this new design allows more flexible syntax, especially that we won't need to create separate json/class objects to create one object from another type.

HelloApiImpl.cpp

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, UnsettableVector{{1, 2, 3}, "Hello there"}.to_json().dump(4));
}

curl http://127.0.0.1:8080/there

{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
} 

@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model[C++][Pistache] Simplified model templateJul 22, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from ce63ce7 to 8dc01a3CompareJuly 22, 2019 11:36
@etherealjoy

Copy link
Copy Markdown
Contributor

Here we would have a problem for native types for example we serialize everything even if not set, e.g. int being zero, string being "", default or uninitialized values
Which should not be serialized, unless if explicitly set by the application.

Additionally this is a breaking change for all existing code.

@muttleyxd

muttleyxd commented Jul 24, 2019

Copy link
Copy Markdown
ContributorAuthor

You're right.

Anyways, I'd change three things in current model:

  • Add constructor which would allow setting all members with one line
  • Better from/to_json function, so we don't do C style (creating object then passing it to function)
  • Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
    • make getVectorMember() return const reference, and have separate set method
      this has a problem of creating unnecessary objects
    • make getVectorMember() return reference and implicitly set vectorMember_isSet to true
      this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
    • add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

What do you think about it?

@kuzkry

Copy link
Copy Markdown

Additionally, we may think about something resembling:

template <typename... Args>
MyResponse::MyResponse(Args... args);

and if e.g. MyResponse had 5 fields and a user gave only 3, then in return the first three would be set, the rest would not.
The flaws I can see are:

  • use of templates (for some ;)) and workarounds for the lack of fold expressions in C++11
  • forced order of member setting (I mean, the user couldn't tell to initialize last 3 elements)

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd@kuzkry
Thanks for the follow up

Add constructor which would allow setting all members with one line

For objects with lots of members, which is fairly common in REST, it is not intuitive, and default values cannot help when the members of interest are not in order

Better from/to_json function, so we don't do C style (creating object then passing it to function)

This is a good idea

Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
make getVectorMember() return const reference, and have separate set method
this has a problem of creating unnecessary objects
make getVectorMember() return reference and implicitly set vectorMember_isSet to true
this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

You could take a look at the other C++ generators for a hint, Qt5 client/server generator for example.
In general how people use it now is get the vector and start adding items. During serialization if the vector is empy then it is skipped. We could improve here.

In general, please keep in mind drastic changes which involves rework of user code are to be kept as less as possible. Inside the classes is not a problem, just we have to be careful what the user code will access.

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

Closing & Reopening to retrigger CI

@muttleyxdmuttleyxd reopened this Sep 13, 2019
@muttleyxd

muttleyxd commented Sep 13, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated PR, now it targets 5.0.x branch, as it contains breaking changes.
Non-required fields are wrapped in Pistache::Optional.

@etherealjoy@wing328

struct UnsettableVector
{
Pistache::Optional<std::vector<int32_t>> someints;
Pistache::Optional<std::string> somestring;
nlohmann::json to_json();
static nlohmann::json to_json(const UnsettableVector& o);
static UnsettableVector from_json(const nlohmann::json& j);
};
response.send(Pistache::Http::Code::Ok, UnsettableVector
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}), Pistache::Some(std::string("Hello there"))
}.to_json().dump(4));
curl http://127.0.0.1:8080/there
{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
}

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd
We can target the PR for 4.x by renaming it and then when 5.x arrives we will deprecate the current one.
Does it makes sense ?

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
Let me make sure I understood you correctly:

  • you'd want to add simplified models as new files enabled with an 'optional' flag or something?
    lets' say model-simplified-source.mustache and model-simplified-header.mustache
    for 4.x

and when 5.x arrives, we'd swap them around?

Fine by me, if that's what you meant, since I'm not sure what are your intentions with renaming it

@wing328

Copy link
Copy Markdown
Member

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

@muttleyxd
muttleyxd changed the base branch from 5.0.x to masterSeptember 20, 2019 11:49
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch 2 times, most recently from afc7fe7 to 4d68895CompareSeptember 20, 2019 12:21
@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model templateWIP: [C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 4d68895 to 59efd29CompareSeptember 20, 2019 19:46
@muttleyxdmuttleyxd changed the title WIP: [C++][Pistache] Simplified model template[C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

Thank you for your tips.

Some changes to models & Java code. Please check if they're ok (I don't usually write Java, so I might have done something wrong).

So now model consists of:

struct struct_name {
Pistache::Optional<type> optional_field;
type required_field;
nlohmann::json to_json();
static struct_name from_json(nlohmann::json);
};
void to_json(nlohmann::json &j, struct_name const& o);
void from_json(nlohmann::json const &j, struct_name &o);

The last two methods are required for nlohmann::json.get_to() method to work, hence they are not members of model.
I've tested code it generates, it seems to work both when request is a model or when request is parsed/outputted from/to nlohmann::json.

Calling @etherealjoy since I've done changes I wanted.

@etherealjoy

Copy link
Copy Markdown
Contributor

Interesting, It looks fine for me.
I will try it and give some feedback

@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 59efd29 to 10690f5CompareSeptember 23, 2019 10:49
@muttleyxd

muttleyxd commented Sep 23, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated the PR, I removed some unnecessary code from to_json and from_json methods (as we don't need specific code for model members).

@etherealjoy

Interesting, It looks fine for me.
I will try it and give some feedback

You can play around with UnsettableVector (name comes from old & fixed bug in Pistache's generator), it's a nice and short showcase (well, it lacks required arguments)

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"post:
requestBody:
description: json to deserialize then serializerequired: truecontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"operationId: helloTherePosttags:
- hellosummary: Do something (receive)responses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integermember:
$ref: '#/components/schemas/VectorMember'strmem:
type: stringVectorMember:
type: objectproperties:
number:
type: integertext:
type: string

handlers (HelloApiImpl.cpp)

voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}),
Pistache::Some(VectorMember
{
Pistache::Some(123),
Pistache::None()
}),
Pistache::Some(std::string("hello there"))
};
response.send(Pistache::Http::Code::Ok, vec.to_json().dump());
}
voidHelloApiImpl::hello_there_post(const UnsettableVector &unsettableVector, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, unsettableVector.to_json().dump());
}
curl -s http://127.0.0.1:8080/there
curl -s http://127.0.0.1:8080/there -X POST -d '{"member":{"number":123},"someints":[1,2,3],"strmem":"hello there"}'

it nicely outputs and parses incoming UnsettableVector.

@etherealjoy

Copy link
Copy Markdown
Contributor

This new change is very interesting. Makes it a lot simpler when handling objects.
Did you have a chance to check out this issue #2769
I have not been able to not wrap my around to solving it. I think with this approach it could be solvable.

@etherealjoyetherealjoy added this to the 4.1.3 milestone Sep 29, 2019
@etherealjoy
etherealjoy merged commit 8212e80 into OpenAPITools:masterSep 29, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
I'll take a look at mentioned issue on Monday.

jimschubert added a commit that referenced this pull request Sep 30, 2019
* master: (207 commits)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
[python-experimental] generate model if type != object if enums/validations exist (#2757)
[scala] add [date-time] field to codegen unit test (#3939)
...
Jesse0Michael pushed a commit to Jesse0Michael/openapi-generator that referenced this pull request Oct 3, 2019
* [C++][Pistache] Simplified model template
* [C++][Pistache] Fix for addExternalLibs option
CMake would fail with addExternalLibs set to false
since it'd try to add depenency to not-existing targets
* [C++][Pistache] Update cpp-pistache-server-petstore.sh
* [C++][Pistache] Update Petstore sample
* [C++][Pistache] Update documentation
jimschubert added a commit that referenced this pull request Oct 4, 2019
* master: (110 commits)
[golang] Regenerate all go samples (#3988)
Better tests for string (number) (#3953)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
...
@wing328

Copy link
Copy Markdown
Member

@muttleyxd thanks for the PR, which has been included in the v4.1.3 release: https://twitter.com/oas_generator/status/1180123829626003456

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@muttleyxd@etherealjoy@kuzkry@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[C++][Pistache] Simplified model template - #3417

Merged
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model
Sep 29, 2019
Merged

[C++][Pistache] Simplified model template#3417
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model

Conversation

@muttleyxd

Copy link
Copy Markdown
Contributor

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

@ravinikam@stkrwork@etherealjoy@MartinDelille

Description of the PR

Well, this PR targets two issues:

  • There's a bug in current generator, if you declare a structure containing an array, then it will be declared as std::vector, which is good. But also there won't be a setter, which for me is fine, since you can get it through getter. But it doesn't set isSet variable, which means to_json function doesn't do anything useful (well it puts some members into json, but not all).
classUnsettableVector {
public:
std::vector<int32_t>& getSomeints();
// Missing setterboolsomeintsIsSet() const;
voidunsetSomeints();
}

YAML:

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integersomestring:
type: string

HelloApiImpl.cpp:

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec;
vec.setSomestring("Hello there");
vec.getSomeints().push_back(1);
vec.getSomeints().push_back(2);
vec.getSomeints().push_back(3);
nlohmann::json json;
to_json(json, vec);
response.send(Pistache::Http::Code::Ok, json.dump(4));
}

curl http://127.0.0.1:8080/there

{
"somestring": "Hello there"
} 

someints are missing

  • Second issue may not be an issue, even it may be better design, so that's a thing to discuss. I don't come from Java, so this model looks like unneeded OOP, when this model could've been a simpler struct.
    I don't know what to do with optional fields, since I wasn't able to influence current generator to generate different code (so it could omit some parameters), so currently I don't see if it does anything.
    That's why I went with simpler struct like design, which may not be right if there may be optional fields.

Anyways, this new design allows more flexible syntax, especially that we won't need to create separate json/class objects to create one object from another type.

HelloApiImpl.cpp

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, UnsettableVector{{1, 2, 3}, "Hello there"}.to_json().dump(4));
}

curl http://127.0.0.1:8080/there

{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
} 

@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model[C++][Pistache] Simplified model templateJul 22, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from ce63ce7 to 8dc01a3CompareJuly 22, 2019 11:36
@etherealjoy

Copy link
Copy Markdown
Contributor

Here we would have a problem for native types for example we serialize everything even if not set, e.g. int being zero, string being "", default or uninitialized values
Which should not be serialized, unless if explicitly set by the application.

Additionally this is a breaking change for all existing code.

@muttleyxd

muttleyxd commented Jul 24, 2019

Copy link
Copy Markdown
ContributorAuthor

You're right.

Anyways, I'd change three things in current model:

  • Add constructor which would allow setting all members with one line
  • Better from/to_json function, so we don't do C style (creating object then passing it to function)
  • Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
    • make getVectorMember() return const reference, and have separate set method
      this has a problem of creating unnecessary objects
    • make getVectorMember() return reference and implicitly set vectorMember_isSet to true
      this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
    • add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

What do you think about it?

@kuzkry

Copy link
Copy Markdown

Additionally, we may think about something resembling:

template <typename... Args>
MyResponse::MyResponse(Args... args);

and if e.g. MyResponse had 5 fields and a user gave only 3, then in return the first three would be set, the rest would not.
The flaws I can see are:

  • use of templates (for some ;)) and workarounds for the lack of fold expressions in C++11
  • forced order of member setting (I mean, the user couldn't tell to initialize last 3 elements)

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd@kuzkry
Thanks for the follow up

Add constructor which would allow setting all members with one line

For objects with lots of members, which is fairly common in REST, it is not intuitive, and default values cannot help when the members of interest are not in order

Better from/to_json function, so we don't do C style (creating object then passing it to function)

This is a good idea

Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
make getVectorMember() return const reference, and have separate set method
this has a problem of creating unnecessary objects
make getVectorMember() return reference and implicitly set vectorMember_isSet to true
this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

You could take a look at the other C++ generators for a hint, Qt5 client/server generator for example.
In general how people use it now is get the vector and start adding items. During serialization if the vector is empy then it is skipped. We could improve here.

In general, please keep in mind drastic changes which involves rework of user code are to be kept as less as possible. Inside the classes is not a problem, just we have to be careful what the user code will access.

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

Closing & Reopening to retrigger CI

@muttleyxdmuttleyxd reopened this Sep 13, 2019
@muttleyxd

muttleyxd commented Sep 13, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated PR, now it targets 5.0.x branch, as it contains breaking changes.
Non-required fields are wrapped in Pistache::Optional.

@etherealjoy@wing328

struct UnsettableVector
{
Pistache::Optional<std::vector<int32_t>> someints;
Pistache::Optional<std::string> somestring;
nlohmann::json to_json();
static nlohmann::json to_json(const UnsettableVector& o);
static UnsettableVector from_json(const nlohmann::json& j);
};
response.send(Pistache::Http::Code::Ok, UnsettableVector
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}), Pistache::Some(std::string("Hello there"))
}.to_json().dump(4));
curl http://127.0.0.1:8080/there
{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
}

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd
We can target the PR for 4.x by renaming it and then when 5.x arrives we will deprecate the current one.
Does it makes sense ?

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
Let me make sure I understood you correctly:

  • you'd want to add simplified models as new files enabled with an 'optional' flag or something?
    lets' say model-simplified-source.mustache and model-simplified-header.mustache
    for 4.x

and when 5.x arrives, we'd swap them around?

Fine by me, if that's what you meant, since I'm not sure what are your intentions with renaming it

@wing328

Copy link
Copy Markdown
Member

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

@muttleyxd
muttleyxd changed the base branch from 5.0.x to masterSeptember 20, 2019 11:49
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch 2 times, most recently from afc7fe7 to 4d68895CompareSeptember 20, 2019 12:21
@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model templateWIP: [C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 4d68895 to 59efd29CompareSeptember 20, 2019 19:46
@muttleyxdmuttleyxd changed the title WIP: [C++][Pistache] Simplified model template[C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

Thank you for your tips.

Some changes to models & Java code. Please check if they're ok (I don't usually write Java, so I might have done something wrong).

So now model consists of:

struct struct_name {
Pistache::Optional<type> optional_field;
type required_field;
nlohmann::json to_json();
static struct_name from_json(nlohmann::json);
};
void to_json(nlohmann::json &j, struct_name const& o);
void from_json(nlohmann::json const &j, struct_name &o);

The last two methods are required for nlohmann::json.get_to() method to work, hence they are not members of model.
I've tested code it generates, it seems to work both when request is a model or when request is parsed/outputted from/to nlohmann::json.

Calling @etherealjoy since I've done changes I wanted.

@etherealjoy

Copy link
Copy Markdown
Contributor

Interesting, It looks fine for me.
I will try it and give some feedback

@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 59efd29 to 10690f5CompareSeptember 23, 2019 10:49
@muttleyxd

muttleyxd commented Sep 23, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated the PR, I removed some unnecessary code from to_json and from_json methods (as we don't need specific code for model members).

@etherealjoy

Interesting, It looks fine for me.
I will try it and give some feedback

You can play around with UnsettableVector (name comes from old & fixed bug in Pistache's generator), it's a nice and short showcase (well, it lacks required arguments)

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"post:
requestBody:
description: json to deserialize then serializerequired: truecontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"operationId: helloTherePosttags:
- hellosummary: Do something (receive)responses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integermember:
$ref: '#/components/schemas/VectorMember'strmem:
type: stringVectorMember:
type: objectproperties:
number:
type: integertext:
type: string

handlers (HelloApiImpl.cpp)

voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}),
Pistache::Some(VectorMember
{
Pistache::Some(123),
Pistache::None()
}),
Pistache::Some(std::string("hello there"))
};
response.send(Pistache::Http::Code::Ok, vec.to_json().dump());
}
voidHelloApiImpl::hello_there_post(const UnsettableVector &unsettableVector, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, unsettableVector.to_json().dump());
}
curl -s http://127.0.0.1:8080/there
curl -s http://127.0.0.1:8080/there -X POST -d '{"member":{"number":123},"someints":[1,2,3],"strmem":"hello there"}'

it nicely outputs and parses incoming UnsettableVector.

@etherealjoy

Copy link
Copy Markdown
Contributor

This new change is very interesting. Makes it a lot simpler when handling objects.
Did you have a chance to check out this issue #2769
I have not been able to not wrap my around to solving it. I think with this approach it could be solvable.

@etherealjoyetherealjoy added this to the 4.1.3 milestone Sep 29, 2019
@etherealjoy
etherealjoy merged commit 8212e80 into OpenAPITools:masterSep 29, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
I'll take a look at mentioned issue on Monday.

jimschubert added a commit that referenced this pull request Sep 30, 2019
* master: (207 commits)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
[python-experimental] generate model if type != object if enums/validations exist (#2757)
[scala] add [date-time] field to codegen unit test (#3939)
...
Jesse0Michael pushed a commit to Jesse0Michael/openapi-generator that referenced this pull request Oct 3, 2019
* [C++][Pistache] Simplified model template
* [C++][Pistache] Fix for addExternalLibs option
CMake would fail with addExternalLibs set to false
since it'd try to add depenency to not-existing targets
* [C++][Pistache] Update cpp-pistache-server-petstore.sh
* [C++][Pistache] Update Petstore sample
* [C++][Pistache] Update documentation
jimschubert added a commit that referenced this pull request Oct 4, 2019
* master: (110 commits)
[golang] Regenerate all go samples (#3988)
Better tests for string (number) (#3953)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
...
@wing328

Copy link
Copy Markdown
Member

@muttleyxd thanks for the PR, which has been included in the v4.1.3 release: https://twitter.com/oas_generator/status/1180123829626003456

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@muttleyxd@etherealjoy@kuzkry@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[C++][Pistache] Simplified model template - #3417

Merged
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model
Sep 29, 2019
Merged

[C++][Pistache] Simplified model template#3417
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model

Conversation

@muttleyxd

Copy link
Copy Markdown
Contributor

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

@ravinikam@stkrwork@etherealjoy@MartinDelille

Description of the PR

Well, this PR targets two issues:

  • There's a bug in current generator, if you declare a structure containing an array, then it will be declared as std::vector, which is good. But also there won't be a setter, which for me is fine, since you can get it through getter. But it doesn't set isSet variable, which means to_json function doesn't do anything useful (well it puts some members into json, but not all).
classUnsettableVector {
public:
std::vector<int32_t>& getSomeints();
// Missing setterboolsomeintsIsSet() const;
voidunsetSomeints();
}

YAML:

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integersomestring:
type: string

HelloApiImpl.cpp:

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec;
vec.setSomestring("Hello there");
vec.getSomeints().push_back(1);
vec.getSomeints().push_back(2);
vec.getSomeints().push_back(3);
nlohmann::json json;
to_json(json, vec);
response.send(Pistache::Http::Code::Ok, json.dump(4));
}

curl http://127.0.0.1:8080/there

{
"somestring": "Hello there"
} 

someints are missing

  • Second issue may not be an issue, even it may be better design, so that's a thing to discuss. I don't come from Java, so this model looks like unneeded OOP, when this model could've been a simpler struct.
    I don't know what to do with optional fields, since I wasn't able to influence current generator to generate different code (so it could omit some parameters), so currently I don't see if it does anything.
    That's why I went with simpler struct like design, which may not be right if there may be optional fields.

Anyways, this new design allows more flexible syntax, especially that we won't need to create separate json/class objects to create one object from another type.

HelloApiImpl.cpp

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, UnsettableVector{{1, 2, 3}, "Hello there"}.to_json().dump(4));
}

curl http://127.0.0.1:8080/there

{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
} 

@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model[C++][Pistache] Simplified model templateJul 22, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from ce63ce7 to 8dc01a3CompareJuly 22, 2019 11:36
@etherealjoy

Copy link
Copy Markdown
Contributor

Here we would have a problem for native types for example we serialize everything even if not set, e.g. int being zero, string being "", default or uninitialized values
Which should not be serialized, unless if explicitly set by the application.

Additionally this is a breaking change for all existing code.

@muttleyxd

muttleyxd commented Jul 24, 2019

Copy link
Copy Markdown
ContributorAuthor

You're right.

Anyways, I'd change three things in current model:

  • Add constructor which would allow setting all members with one line
  • Better from/to_json function, so we don't do C style (creating object then passing it to function)
  • Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
    • make getVectorMember() return const reference, and have separate set method
      this has a problem of creating unnecessary objects
    • make getVectorMember() return reference and implicitly set vectorMember_isSet to true
      this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
    • add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

What do you think about it?

@kuzkry

Copy link
Copy Markdown

Additionally, we may think about something resembling:

template <typename... Args>
MyResponse::MyResponse(Args... args);

and if e.g. MyResponse had 5 fields and a user gave only 3, then in return the first three would be set, the rest would not.
The flaws I can see are:

  • use of templates (for some ;)) and workarounds for the lack of fold expressions in C++11
  • forced order of member setting (I mean, the user couldn't tell to initialize last 3 elements)

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd@kuzkry
Thanks for the follow up

Add constructor which would allow setting all members with one line

For objects with lots of members, which is fairly common in REST, it is not intuitive, and default values cannot help when the members of interest are not in order

Better from/to_json function, so we don't do C style (creating object then passing it to function)

This is a good idea

Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
make getVectorMember() return const reference, and have separate set method
this has a problem of creating unnecessary objects
make getVectorMember() return reference and implicitly set vectorMember_isSet to true
this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

You could take a look at the other C++ generators for a hint, Qt5 client/server generator for example.
In general how people use it now is get the vector and start adding items. During serialization if the vector is empy then it is skipped. We could improve here.

In general, please keep in mind drastic changes which involves rework of user code are to be kept as less as possible. Inside the classes is not a problem, just we have to be careful what the user code will access.

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

Closing & Reopening to retrigger CI

@muttleyxdmuttleyxd reopened this Sep 13, 2019
@muttleyxd

muttleyxd commented Sep 13, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated PR, now it targets 5.0.x branch, as it contains breaking changes.
Non-required fields are wrapped in Pistache::Optional.

@etherealjoy@wing328

struct UnsettableVector
{
Pistache::Optional<std::vector<int32_t>> someints;
Pistache::Optional<std::string> somestring;
nlohmann::json to_json();
static nlohmann::json to_json(const UnsettableVector& o);
static UnsettableVector from_json(const nlohmann::json& j);
};
response.send(Pistache::Http::Code::Ok, UnsettableVector
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}), Pistache::Some(std::string("Hello there"))
}.to_json().dump(4));
curl http://127.0.0.1:8080/there
{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
}

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd
We can target the PR for 4.x by renaming it and then when 5.x arrives we will deprecate the current one.
Does it makes sense ?

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
Let me make sure I understood you correctly:

  • you'd want to add simplified models as new files enabled with an 'optional' flag or something?
    lets' say model-simplified-source.mustache and model-simplified-header.mustache
    for 4.x

and when 5.x arrives, we'd swap them around?

Fine by me, if that's what you meant, since I'm not sure what are your intentions with renaming it

@wing328

Copy link
Copy Markdown
Member

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

@muttleyxd
muttleyxd changed the base branch from 5.0.x to masterSeptember 20, 2019 11:49
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch 2 times, most recently from afc7fe7 to 4d68895CompareSeptember 20, 2019 12:21
@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model templateWIP: [C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 4d68895 to 59efd29CompareSeptember 20, 2019 19:46
@muttleyxdmuttleyxd changed the title WIP: [C++][Pistache] Simplified model template[C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

Thank you for your tips.

Some changes to models & Java code. Please check if they're ok (I don't usually write Java, so I might have done something wrong).

So now model consists of:

struct struct_name {
Pistache::Optional<type> optional_field;
type required_field;
nlohmann::json to_json();
static struct_name from_json(nlohmann::json);
};
void to_json(nlohmann::json &j, struct_name const& o);
void from_json(nlohmann::json const &j, struct_name &o);

The last two methods are required for nlohmann::json.get_to() method to work, hence they are not members of model.
I've tested code it generates, it seems to work both when request is a model or when request is parsed/outputted from/to nlohmann::json.

Calling @etherealjoy since I've done changes I wanted.

@etherealjoy

Copy link
Copy Markdown
Contributor

Interesting, It looks fine for me.
I will try it and give some feedback

@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 59efd29 to 10690f5CompareSeptember 23, 2019 10:49
@muttleyxd

muttleyxd commented Sep 23, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated the PR, I removed some unnecessary code from to_json and from_json methods (as we don't need specific code for model members).

@etherealjoy

Interesting, It looks fine for me.
I will try it and give some feedback

You can play around with UnsettableVector (name comes from old & fixed bug in Pistache's generator), it's a nice and short showcase (well, it lacks required arguments)

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"post:
requestBody:
description: json to deserialize then serializerequired: truecontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"operationId: helloTherePosttags:
- hellosummary: Do something (receive)responses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integermember:
$ref: '#/components/schemas/VectorMember'strmem:
type: stringVectorMember:
type: objectproperties:
number:
type: integertext:
type: string

handlers (HelloApiImpl.cpp)

voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}),
Pistache::Some(VectorMember
{
Pistache::Some(123),
Pistache::None()
}),
Pistache::Some(std::string("hello there"))
};
response.send(Pistache::Http::Code::Ok, vec.to_json().dump());
}
voidHelloApiImpl::hello_there_post(const UnsettableVector &unsettableVector, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, unsettableVector.to_json().dump());
}
curl -s http://127.0.0.1:8080/there
curl -s http://127.0.0.1:8080/there -X POST -d '{"member":{"number":123},"someints":[1,2,3],"strmem":"hello there"}'

it nicely outputs and parses incoming UnsettableVector.

@etherealjoy

Copy link
Copy Markdown
Contributor

This new change is very interesting. Makes it a lot simpler when handling objects.
Did you have a chance to check out this issue #2769
I have not been able to not wrap my around to solving it. I think with this approach it could be solvable.

@etherealjoyetherealjoy added this to the 4.1.3 milestone Sep 29, 2019
@etherealjoy
etherealjoy merged commit 8212e80 into OpenAPITools:masterSep 29, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
I'll take a look at mentioned issue on Monday.

jimschubert added a commit that referenced this pull request Sep 30, 2019
* master: (207 commits)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
[python-experimental] generate model if type != object if enums/validations exist (#2757)
[scala] add [date-time] field to codegen unit test (#3939)
...
Jesse0Michael pushed a commit to Jesse0Michael/openapi-generator that referenced this pull request Oct 3, 2019
* [C++][Pistache] Simplified model template
* [C++][Pistache] Fix for addExternalLibs option
CMake would fail with addExternalLibs set to false
since it'd try to add depenency to not-existing targets
* [C++][Pistache] Update cpp-pistache-server-petstore.sh
* [C++][Pistache] Update Petstore sample
* [C++][Pistache] Update documentation
jimschubert added a commit that referenced this pull request Oct 4, 2019
* master: (110 commits)
[golang] Regenerate all go samples (#3988)
Better tests for string (number) (#3953)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
...
@wing328

Copy link
Copy Markdown
Member

@muttleyxd thanks for the PR, which has been included in the v4.1.3 release: https://twitter.com/oas_generator/status/1180123829626003456

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@muttleyxd@etherealjoy@kuzkry@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[C++][Pistache] Simplified model template - #3417

Merged
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model
Sep 29, 2019
Merged

[C++][Pistache] Simplified model template#3417
etherealjoy merged 5 commits into
OpenAPITools:masterfrom
muttleyxd:pistache-simplified-model

Conversation

@muttleyxd

Copy link
Copy Markdown
Contributor

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

@ravinikam@stkrwork@etherealjoy@MartinDelille

Description of the PR

Well, this PR targets two issues:

  • There's a bug in current generator, if you declare a structure containing an array, then it will be declared as std::vector, which is good. But also there won't be a setter, which for me is fine, since you can get it through getter. But it doesn't set isSet variable, which means to_json function doesn't do anything useful (well it puts some members into json, but not all).
classUnsettableVector {
public:
std::vector<int32_t>& getSomeints();
// Missing setterboolsomeintsIsSet() const;
voidunsetSomeints();
}

YAML:

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integersomestring:
type: string

HelloApiImpl.cpp:

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec;
vec.setSomestring("Hello there");
vec.getSomeints().push_back(1);
vec.getSomeints().push_back(2);
vec.getSomeints().push_back(3);
nlohmann::json json;
to_json(json, vec);
response.send(Pistache::Http::Code::Ok, json.dump(4));
}

curl http://127.0.0.1:8080/there

{
"somestring": "Hello there"
} 

someints are missing

  • Second issue may not be an issue, even it may be better design, so that's a thing to discuss. I don't come from Java, so this model looks like unneeded OOP, when this model could've been a simpler struct.
    I don't know what to do with optional fields, since I wasn't able to influence current generator to generate different code (so it could omit some parameters), so currently I don't see if it does anything.
    That's why I went with simpler struct like design, which may not be right if there may be optional fields.

Anyways, this new design allows more flexible syntax, especially that we won't need to create separate json/class objects to create one object from another type.

HelloApiImpl.cpp

#include"UnsettableVector.h"voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, UnsettableVector{{1, 2, 3}, "Hello there"}.to_json().dump(4));
}

curl http://127.0.0.1:8080/there

{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
} 

@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model[C++][Pistache] Simplified model templateJul 22, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from ce63ce7 to 8dc01a3CompareJuly 22, 2019 11:36
@etherealjoy

Copy link
Copy Markdown
Contributor

Here we would have a problem for native types for example we serialize everything even if not set, e.g. int being zero, string being "", default or uninitialized values
Which should not be serialized, unless if explicitly set by the application.

Additionally this is a breaking change for all existing code.

@muttleyxd

muttleyxd commented Jul 24, 2019

Copy link
Copy Markdown
ContributorAuthor

You're right.

Anyways, I'd change three things in current model:

  • Add constructor which would allow setting all members with one line
  • Better from/to_json function, so we don't do C style (creating object then passing it to function)
  • Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
    • make getVectorMember() return const reference, and have separate set method
      this has a problem of creating unnecessary objects
    • make getVectorMember() return reference and implicitly set vectorMember_isSet to true
      this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
    • add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

What do you think about it?

@kuzkry

Copy link
Copy Markdown

Additionally, we may think about something resembling:

template <typename... Args>
MyResponse::MyResponse(Args... args);

and if e.g. MyResponse had 5 fields and a user gave only 3, then in return the first three would be set, the rest would not.
The flaws I can see are:

  • use of templates (for some ;)) and workarounds for the lack of fold expressions in C++11
  • forced order of member setting (I mean, the user couldn't tell to initialize last 3 elements)

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd@kuzkry
Thanks for the follow up

Add constructor which would allow setting all members with one line

For objects with lots of members, which is fairly common in REST, it is not intuitive, and default values cannot help when the members of interest are not in order

Better from/to_json function, so we don't do C style (creating object then passing it to function)

This is a good idea

Fix setter for containers, but I'm not sure what should be done here, I see three ideas:
make getVectorMember() return const reference, and have separate set method
this has a problem of creating unnecessary objects
make getVectorMember() return reference and implicitly set vectorMember_isSet to true
this has a problem that user could receive this model, check if meaningful is inside, get empty vector then pass it further with different value than was before
add setVectorMemberIsSet() function, this doesn't seem intiuitive for me, but it solves two above problems

You could take a look at the other C++ generators for a hint, Qt5 client/server generator for example.
In general how people use it now is get the vector and start adding items. During serialization if the vector is empy then it is skipped. We could improve here.

In general, please keep in mind drastic changes which involves rework of user code are to be kept as less as possible. Inside the classes is not a problem, just we have to be careful what the user code will access.

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

Closing & Reopening to retrigger CI

@muttleyxdmuttleyxd reopened this Sep 13, 2019
@muttleyxd

muttleyxd commented Sep 13, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated PR, now it targets 5.0.x branch, as it contains breaking changes.
Non-required fields are wrapped in Pistache::Optional.

@etherealjoy@wing328

struct UnsettableVector
{
Pistache::Optional<std::vector<int32_t>> someints;
Pistache::Optional<std::string> somestring;
nlohmann::json to_json();
static nlohmann::json to_json(const UnsettableVector& o);
static UnsettableVector from_json(const nlohmann::json& j);
};
response.send(Pistache::Http::Code::Ok, UnsettableVector
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}), Pistache::Some(std::string("Hello there"))
}.to_json().dump(4));
curl http://127.0.0.1:8080/there
{
"someints": [
1,
2,
3
],
"somestring": "Hello there"
}

@etherealjoy

Copy link
Copy Markdown
Contributor

@muttleyxd
We can target the PR for 4.x by renaming it and then when 5.x arrives we will deprecate the current one.
Does it makes sense ?

@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
Let me make sure I understood you correctly:

  • you'd want to add simplified models as new files enabled with an 'optional' flag or something?
    lets' say model-simplified-source.mustache and model-simplified-header.mustache
    for 4.x

and when 5.x arrives, we'd swap them around?

Fine by me, if that's what you meant, since I'm not sure what are your intentions with renaming it

@wing328

Copy link
Copy Markdown
Member

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

@muttleyxd
muttleyxd changed the base branch from 5.0.x to masterSeptember 20, 2019 11:49
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch 2 times, most recently from afc7fe7 to 4d68895CompareSeptember 20, 2019 12:21
@muttleyxdmuttleyxd changed the title [C++][Pistache] Simplified model templateWIP: [C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 4d68895 to 59efd29CompareSeptember 20, 2019 19:46
@muttleyxdmuttleyxd changed the title WIP: [C++][Pistache] Simplified model template[C++][Pistache] Simplified model templateSep 20, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

and when 5.x arrives, we'd swap them around?

We can make yours as the default in 5.x release but my guess is that there will be developers who prefer the current implementation so we need to keep it as an option.

For models in other generators (e.g. C#, Java), there are various options to customize the model so as to meet different requirement/preference.

Thank you for your tips.

Some changes to models & Java code. Please check if they're ok (I don't usually write Java, so I might have done something wrong).

So now model consists of:

struct struct_name {
Pistache::Optional<type> optional_field;
type required_field;
nlohmann::json to_json();
static struct_name from_json(nlohmann::json);
};
void to_json(nlohmann::json &j, struct_name const& o);
void from_json(nlohmann::json const &j, struct_name &o);

The last two methods are required for nlohmann::json.get_to() method to work, hence they are not members of model.
I've tested code it generates, it seems to work both when request is a model or when request is parsed/outputted from/to nlohmann::json.

Calling @etherealjoy since I've done changes I wanted.

@etherealjoy

Copy link
Copy Markdown
Contributor

Interesting, It looks fine for me.
I will try it and give some feedback

@muttleyxd
muttleyxdforce-pushed the pistache-simplified-model branch from 59efd29 to 10690f5CompareSeptember 23, 2019 10:49
@muttleyxd

muttleyxd commented Sep 23, 2019

Copy link
Copy Markdown
ContributorAuthor

I've updated the PR, I removed some unnecessary code from to_json and from_json methods (as we don't need specific code for model members).

@etherealjoy

Interesting, It looks fine for me.
I will try it and give some feedback

You can play around with UnsettableVector (name comes from old & fixed bug in Pistache's generator), it's a nice and short showcase (well, it lacks required arguments)

openapi: 3.0.0info:
description: Some descriptionversion: 0.0.1title: Some titletags:
- name: hellopaths:
"/there":
get:
operationId: helloThereGettags:
- hellosummary: Do somethingresponses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"post:
requestBody:
description: json to deserialize then serializerequired: truecontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"operationId: helloTherePosttags:
- hellosummary: Do something (receive)responses:
200:
description: Successful operationcontent:
application/json:
schema:
$ref: "#/components/schemas/UnsettableVector"servers:
- url: http://localhost:8080components:
schemas:
UnsettableVector:
type: objectproperties:
someints:
type: arrayitems:
type: integermember:
$ref: '#/components/schemas/VectorMember'strmem:
type: stringVectorMember:
type: objectproperties:
number:
type: integertext:
type: string

handlers (HelloApiImpl.cpp)

voidHelloApiImpl::hello_there_get(Pistache::Http::ResponseWriter &response) {
UnsettableVector vec
{
Pistache::Some(std::vector<int32_t>{1, 2, 3}),
Pistache::Some(VectorMember
{
Pistache::Some(123),
Pistache::None()
}),
Pistache::Some(std::string("hello there"))
};
response.send(Pistache::Http::Code::Ok, vec.to_json().dump());
}
voidHelloApiImpl::hello_there_post(const UnsettableVector &unsettableVector, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, unsettableVector.to_json().dump());
}
curl -s http://127.0.0.1:8080/there
curl -s http://127.0.0.1:8080/there -X POST -d '{"member":{"number":123},"someints":[1,2,3],"strmem":"hello there"}'

it nicely outputs and parses incoming UnsettableVector.

@etherealjoy

Copy link
Copy Markdown
Contributor

This new change is very interesting. Makes it a lot simpler when handling objects.
Did you have a chance to check out this issue #2769
I have not been able to not wrap my around to solving it. I think with this approach it could be solvable.

@etherealjoyetherealjoy added this to the 4.1.3 milestone Sep 29, 2019
@etherealjoy
etherealjoy merged commit 8212e80 into OpenAPITools:masterSep 29, 2019
@muttleyxd

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy
I'll take a look at mentioned issue on Monday.

jimschubert added a commit that referenced this pull request Sep 30, 2019
* master: (207 commits)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
[python-experimental] generate model if type != object if enums/validations exist (#2757)
[scala] add [date-time] field to codegen unit test (#3939)
...
Jesse0Michael pushed a commit to Jesse0Michael/openapi-generator that referenced this pull request Oct 3, 2019
* [C++][Pistache] Simplified model template
* [C++][Pistache] Fix for addExternalLibs option
CMake would fail with addExternalLibs set to false
since it'd try to add depenency to not-existing targets
* [C++][Pistache] Update cpp-pistache-server-petstore.sh
* [C++][Pistache] Update Petstore sample
* [C++][Pistache] Update documentation
jimschubert added a commit that referenced this pull request Oct 4, 2019
* master: (110 commits)
[golang] Regenerate all go samples (#3988)
Better tests for string (number) (#3953)
Add missing enum processing in C++ codegen, already present for Qt5 (#3986)
[C++] [Pistache] Removed deprecated warnings (#3985)
[C++][Pistache] Simplified model template (#3417)
add go oas3 petstore to ensure up-to-date (#3979)
replace gitter with slack in the doc (#3977)
Fix wrong variable name in LessThan and LessThanOrEqual asserts (#3971)
#3957 - Removed hardcoded baseUrl (#3964)
Regenerate go openapi3 samples (#3975)
[rust] Make it easier to test rust client generator (#3543)
Fix issue3635 (#3948)
add gradle repository (#3867)
[java] allow to use setArtifactVersion() programmatically (#3907)
Add a link to DevRelCon SF 2019 (#3961)
Add a link to a medium blog post (#3960)
update maven-compiler-plugin version (#3956)
fix generateAliasAsModels in default generator (#3951)
Implement BigDecimal to Decimal in swift4 for currency data as type=string format=number (#3910)
Add F# Functions server generator (#3933)
...
@wing328

Copy link
Copy Markdown
Member

@muttleyxd thanks for the PR, which has been included in the v4.1.3 release: https://twitter.com/oas_generator/status/1180123829626003456

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@muttleyxd@etherealjoy@kuzkry@wing328