Skip to content

[C++] [Qt5] Add enum support for client and server - #2339

Merged
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support
Mar 30, 2019
Merged

[C++] [Qt5] Add enum support for client and server#2339
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support

Conversation

@etherealjoy

@etherealjoyetherealjoy commented Mar 9, 2019

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, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{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\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

  • add support for enum for Qt5 client and server
  • extend tests for Qt5 client

Spec used for testing client and server

---
# This is a sample Swagger spec, describing a simple API as a starting point.swagger: "2.0"info:
description: Template Descriptionversion: 1.0.0title: Testspechost: 0.0.0.0:8080basePath: /apischemes:
- httppaths:
/v1.0/testintenum:
get:
description: ""operationId: testintenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum:
get:
description: ""operationId: teststringenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/testintenum1:
get:
description: ""operationId: testintenum1responses:
200:
description: "Successful response"schema:
type: objectadditionalProperties: $ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum1:
get:
description: ""operationId: teststringenum1responses:
200:
description: "Successful response"schema:
type: arrayitems:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/test:
get:
description: ""operationId: testresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/enumeration'400:
description: "The request was not successfully executed."definitions:
stringEnum:
description: "string enum"enum:
- abc
- def
- ghitype: stringintEnum:
description: "integer enum"enum:
- 1
- 2
- 3type: integerenumeration:
type: objectdescription: "string enum"properties:
enint:
$ref: '#/definitions/intEnum'enstr:
$ref: '#/definitions/stringEnum'enarr:
type: arrayitems:
$ref: '#/definitions/stringEnum'enaobj:
type: objectadditionalProperties:
$ref: '#/definitions/intEnum'

cc:
@stkrwork@MartinDelille@fvarose@ravinikam

@MartinDelilleMartinDelille left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at your PR by executing the openapi 3 script
locally and I wondered why the petstore example wasn't updated accordingly since it declare enum like here: https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml#L74-L77

@etherealjoy

etherealjoy commented Mar 16, 2019

Copy link
Copy Markdown
ContributorAuthor

Yes, unfortunately this enum is inside the query.
I was wondering what to do here, since support for objects in query also is not yet supported
As a next step we could add object and enum support in queries/headers

@etherealjoy

Copy link
Copy Markdown
ContributorAuthor

@stkrwork@MartinDelille@fvarose@ravinikam
Any objections if we go ahead with this and add improvements later?

@wing328

Copy link
Copy Markdown
Member

Any objections if we go ahead with this and add improvements later?

Let's go with this approach.

@wing328
wing328 merged commit 3bb4edf into OpenAPITools:masterMar 30, 2019
@etherealjoy
etherealjoy deleted the cppqt5_enum_support branch March 30, 2019 08:46
@etherealjoyetherealjoy added this to the 4.0.0 milestone Mar 30, 2019
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request Apr 1, 2019
* master: (48 commits)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (OpenAPITools#2522)
OpenAPITools#1023 - [Scala] Use status family during response processing (OpenAPITools#1024)
Generate setters for readonly properties in server code (OpenAPITools#1582)
[JS] fix NPE for null string and improve Travis config file (OpenAPITools#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (OpenAPITools#2545)
[csharp] update sample after OpenAPITools#2528 (OpenAPITools#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (OpenAPITools#2511)
Aspnetcore nullable support (OpenAPITools#2529)
Csharp nullable support (OpenAPITools#2528)
[C++] [Qt5] Add enum support for client and server (OpenAPITools#2339)
Fixed typo in migration-from-swagger-codegen.md (OpenAPITools#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (OpenAPITools#2514)
[KOTLIN] fix var name not correctly sanitized (OpenAPITools#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (OpenAPITools#2262)
Add @karismann to Java and Kotlin technical committee (OpenAPITools#2542)
Add GoDaddy to the list of companies using OpenAPI Generator (OpenAPITools#2541)
[Kotlin SpringBoot Server] alternative: fix optional parameter not correctly declared in service (OpenAPITools#2539)
improve indentation, update dependencies (OpenAPITools#2521)
update kotlin spring samples
[JAVA] Use specified data type in enum's fromValue instead of string (OpenAPITools#2347)
...
jimschubert added a commit that referenced this pull request Apr 2, 2019
* master: (133 commits)
#2503: fix out-of-memory issue with nested objects with arrays with maxItems set by limiting to max. 5 example items (#2536)
remove emitDefaultValue option (#2559)
fix EmitDefaultValue default vallue with false (#2558)
Added API Key auth to rust-server (#2459)
remove initialCaps and replace with camelize (#2546)
Add packageName configuration to maven (#2429)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (#2522)
#1023 - [Scala] Use status family during response processing (#1024)
Generate setters for readonly properties in server code (#1582)
[JS] fix NPE for null string and improve Travis config file (#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (#2545)
[csharp] update sample after #2528 (#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (#2511)
Aspnetcore nullable support (#2529)
Csharp nullable support (#2528)
[C++] [Qt5] Add enum support for client and server (#2339)
Fixed typo in migration-from-swagger-codegen.md (#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (#2514)
[KOTLIN] fix var name not correctly sanitized (#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (#2262)
...
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.

3 participants

@etherealjoy@wing328@MartinDelille
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[C++] [Qt5] Add enum support for client and server by etherealjoy · Pull Request #2339 · OpenAPITools/openapi-generator · GitHub
Skip to content

[C++] [Qt5] Add enum support for client and server - #2339

Merged
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support
Mar 30, 2019
Merged

[C++] [Qt5] Add enum support for client and server#2339
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support

Conversation

@etherealjoy

@etherealjoyetherealjoy commented Mar 9, 2019

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, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{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\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

  • add support for enum for Qt5 client and server
  • extend tests for Qt5 client

Spec used for testing client and server

---
# This is a sample Swagger spec, describing a simple API as a starting point.swagger: "2.0"info:
description: Template Descriptionversion: 1.0.0title: Testspechost: 0.0.0.0:8080basePath: /apischemes:
- httppaths:
/v1.0/testintenum:
get:
description: ""operationId: testintenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum:
get:
description: ""operationId: teststringenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/testintenum1:
get:
description: ""operationId: testintenum1responses:
200:
description: "Successful response"schema:
type: objectadditionalProperties: $ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum1:
get:
description: ""operationId: teststringenum1responses:
200:
description: "Successful response"schema:
type: arrayitems:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/test:
get:
description: ""operationId: testresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/enumeration'400:
description: "The request was not successfully executed."definitions:
stringEnum:
description: "string enum"enum:
- abc
- def
- ghitype: stringintEnum:
description: "integer enum"enum:
- 1
- 2
- 3type: integerenumeration:
type: objectdescription: "string enum"properties:
enint:
$ref: '#/definitions/intEnum'enstr:
$ref: '#/definitions/stringEnum'enarr:
type: arrayitems:
$ref: '#/definitions/stringEnum'enaobj:
type: objectadditionalProperties:
$ref: '#/definitions/intEnum'

cc:
@stkrwork@MartinDelille@fvarose@ravinikam

@MartinDelilleMartinDelille left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at your PR by executing the openapi 3 script
locally and I wondered why the petstore example wasn't updated accordingly since it declare enum like here: https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml#L74-L77

@etherealjoy

etherealjoy commented Mar 16, 2019

Copy link
Copy Markdown
ContributorAuthor

Yes, unfortunately this enum is inside the query.
I was wondering what to do here, since support for objects in query also is not yet supported
As a next step we could add object and enum support in queries/headers

@etherealjoy

Copy link
Copy Markdown
ContributorAuthor

@stkrwork@MartinDelille@fvarose@ravinikam
Any objections if we go ahead with this and add improvements later?

@wing328

Copy link
Copy Markdown
Member

Any objections if we go ahead with this and add improvements later?

Let's go with this approach.

@wing328
wing328 merged commit 3bb4edf into OpenAPITools:masterMar 30, 2019
@etherealjoy
etherealjoy deleted the cppqt5_enum_support branch March 30, 2019 08:46
@etherealjoyetherealjoy added this to the 4.0.0 milestone Mar 30, 2019
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request Apr 1, 2019
* master: (48 commits)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (OpenAPITools#2522)
OpenAPITools#1023 - [Scala] Use status family during response processing (OpenAPITools#1024)
Generate setters for readonly properties in server code (OpenAPITools#1582)
[JS] fix NPE for null string and improve Travis config file (OpenAPITools#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (OpenAPITools#2545)
[csharp] update sample after OpenAPITools#2528 (OpenAPITools#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (OpenAPITools#2511)
Aspnetcore nullable support (OpenAPITools#2529)
Csharp nullable support (OpenAPITools#2528)
[C++] [Qt5] Add enum support for client and server (OpenAPITools#2339)
Fixed typo in migration-from-swagger-codegen.md (OpenAPITools#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (OpenAPITools#2514)
[KOTLIN] fix var name not correctly sanitized (OpenAPITools#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (OpenAPITools#2262)
Add @karismann to Java and Kotlin technical committee (OpenAPITools#2542)
Add GoDaddy to the list of companies using OpenAPI Generator (OpenAPITools#2541)
[Kotlin SpringBoot Server] alternative: fix optional parameter not correctly declared in service (OpenAPITools#2539)
improve indentation, update dependencies (OpenAPITools#2521)
update kotlin spring samples
[JAVA] Use specified data type in enum's fromValue instead of string (OpenAPITools#2347)
...
jimschubert added a commit that referenced this pull request Apr 2, 2019
* master: (133 commits)
#2503: fix out-of-memory issue with nested objects with arrays with maxItems set by limiting to max. 5 example items (#2536)
remove emitDefaultValue option (#2559)
fix EmitDefaultValue default vallue with false (#2558)
Added API Key auth to rust-server (#2459)
remove initialCaps and replace with camelize (#2546)
Add packageName configuration to maven (#2429)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (#2522)
#1023 - [Scala] Use status family during response processing (#1024)
Generate setters for readonly properties in server code (#1582)
[JS] fix NPE for null string and improve Travis config file (#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (#2545)
[csharp] update sample after #2528 (#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (#2511)
Aspnetcore nullable support (#2529)
Csharp nullable support (#2528)
[C++] [Qt5] Add enum support for client and server (#2339)
Fixed typo in migration-from-swagger-codegen.md (#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (#2514)
[KOTLIN] fix var name not correctly sanitized (#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (#2262)
...
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.

3 participants

@etherealjoy@wing328@MartinDelille
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [C++] [Qt5] Add enum support for client and server by etherealjoy · Pull Request #2339 · OpenAPITools/openapi-generator · GitHub
Skip to content

[C++] [Qt5] Add enum support for client and server - #2339

Merged
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support
Mar 30, 2019
Merged

[C++] [Qt5] Add enum support for client and server#2339
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support

Conversation

@etherealjoy

@etherealjoyetherealjoy commented Mar 9, 2019

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, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{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\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

  • add support for enum for Qt5 client and server
  • extend tests for Qt5 client

Spec used for testing client and server

---
# This is a sample Swagger spec, describing a simple API as a starting point.swagger: "2.0"info:
description: Template Descriptionversion: 1.0.0title: Testspechost: 0.0.0.0:8080basePath: /apischemes:
- httppaths:
/v1.0/testintenum:
get:
description: ""operationId: testintenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum:
get:
description: ""operationId: teststringenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/testintenum1:
get:
description: ""operationId: testintenum1responses:
200:
description: "Successful response"schema:
type: objectadditionalProperties: $ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum1:
get:
description: ""operationId: teststringenum1responses:
200:
description: "Successful response"schema:
type: arrayitems:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/test:
get:
description: ""operationId: testresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/enumeration'400:
description: "The request was not successfully executed."definitions:
stringEnum:
description: "string enum"enum:
- abc
- def
- ghitype: stringintEnum:
description: "integer enum"enum:
- 1
- 2
- 3type: integerenumeration:
type: objectdescription: "string enum"properties:
enint:
$ref: '#/definitions/intEnum'enstr:
$ref: '#/definitions/stringEnum'enarr:
type: arrayitems:
$ref: '#/definitions/stringEnum'enaobj:
type: objectadditionalProperties:
$ref: '#/definitions/intEnum'

cc:
@stkrwork@MartinDelille@fvarose@ravinikam

@MartinDelilleMartinDelille left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at your PR by executing the openapi 3 script
locally and I wondered why the petstore example wasn't updated accordingly since it declare enum like here: https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml#L74-L77

@etherealjoy

etherealjoy commented Mar 16, 2019

Copy link
Copy Markdown
ContributorAuthor

Yes, unfortunately this enum is inside the query.
I was wondering what to do here, since support for objects in query also is not yet supported
As a next step we could add object and enum support in queries/headers

@etherealjoy

Copy link
Copy Markdown
ContributorAuthor

@stkrwork@MartinDelille@fvarose@ravinikam
Any objections if we go ahead with this and add improvements later?

@wing328

Copy link
Copy Markdown
Member

Any objections if we go ahead with this and add improvements later?

Let's go with this approach.

@wing328
wing328 merged commit 3bb4edf into OpenAPITools:masterMar 30, 2019
@etherealjoy
etherealjoy deleted the cppqt5_enum_support branch March 30, 2019 08:46
@etherealjoyetherealjoy added this to the 4.0.0 milestone Mar 30, 2019
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request Apr 1, 2019
* master: (48 commits)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (OpenAPITools#2522)
OpenAPITools#1023 - [Scala] Use status family during response processing (OpenAPITools#1024)
Generate setters for readonly properties in server code (OpenAPITools#1582)
[JS] fix NPE for null string and improve Travis config file (OpenAPITools#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (OpenAPITools#2545)
[csharp] update sample after OpenAPITools#2528 (OpenAPITools#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (OpenAPITools#2511)
Aspnetcore nullable support (OpenAPITools#2529)
Csharp nullable support (OpenAPITools#2528)
[C++] [Qt5] Add enum support for client and server (OpenAPITools#2339)
Fixed typo in migration-from-swagger-codegen.md (OpenAPITools#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (OpenAPITools#2514)
[KOTLIN] fix var name not correctly sanitized (OpenAPITools#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (OpenAPITools#2262)
Add @karismann to Java and Kotlin technical committee (OpenAPITools#2542)
Add GoDaddy to the list of companies using OpenAPI Generator (OpenAPITools#2541)
[Kotlin SpringBoot Server] alternative: fix optional parameter not correctly declared in service (OpenAPITools#2539)
improve indentation, update dependencies (OpenAPITools#2521)
update kotlin spring samples
[JAVA] Use specified data type in enum's fromValue instead of string (OpenAPITools#2347)
...
jimschubert added a commit that referenced this pull request Apr 2, 2019
* master: (133 commits)
#2503: fix out-of-memory issue with nested objects with arrays with maxItems set by limiting to max. 5 example items (#2536)
remove emitDefaultValue option (#2559)
fix EmitDefaultValue default vallue with false (#2558)
Added API Key auth to rust-server (#2459)
remove initialCaps and replace with camelize (#2546)
Add packageName configuration to maven (#2429)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (#2522)
#1023 - [Scala] Use status family during response processing (#1024)
Generate setters for readonly properties in server code (#1582)
[JS] fix NPE for null string and improve Travis config file (#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (#2545)
[csharp] update sample after #2528 (#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (#2511)
Aspnetcore nullable support (#2529)
Csharp nullable support (#2528)
[C++] [Qt5] Add enum support for client and server (#2339)
Fixed typo in migration-from-swagger-codegen.md (#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (#2514)
[KOTLIN] fix var name not correctly sanitized (#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (#2262)
...
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.

3 participants

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

[C++] [Qt5] Add enum support for client and server - #2339

Merged
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support
Mar 30, 2019
Merged

[C++] [Qt5] Add enum support for client and server#2339
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support

Conversation

@etherealjoy

@etherealjoyetherealjoy commented Mar 9, 2019

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, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{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\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

  • add support for enum for Qt5 client and server
  • extend tests for Qt5 client

Spec used for testing client and server

---
# This is a sample Swagger spec, describing a simple API as a starting point.swagger: "2.0"info:
description: Template Descriptionversion: 1.0.0title: Testspechost: 0.0.0.0:8080basePath: /apischemes:
- httppaths:
/v1.0/testintenum:
get:
description: ""operationId: testintenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum:
get:
description: ""operationId: teststringenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/testintenum1:
get:
description: ""operationId: testintenum1responses:
200:
description: "Successful response"schema:
type: objectadditionalProperties: $ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum1:
get:
description: ""operationId: teststringenum1responses:
200:
description: "Successful response"schema:
type: arrayitems:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/test:
get:
description: ""operationId: testresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/enumeration'400:
description: "The request was not successfully executed."definitions:
stringEnum:
description: "string enum"enum:
- abc
- def
- ghitype: stringintEnum:
description: "integer enum"enum:
- 1
- 2
- 3type: integerenumeration:
type: objectdescription: "string enum"properties:
enint:
$ref: '#/definitions/intEnum'enstr:
$ref: '#/definitions/stringEnum'enarr:
type: arrayitems:
$ref: '#/definitions/stringEnum'enaobj:
type: objectadditionalProperties:
$ref: '#/definitions/intEnum'

cc:
@stkrwork@MartinDelille@fvarose@ravinikam

@MartinDelilleMartinDelille left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at your PR by executing the openapi 3 script
locally and I wondered why the petstore example wasn't updated accordingly since it declare enum like here: https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml#L74-L77

@etherealjoy

etherealjoy commented Mar 16, 2019

Copy link
Copy Markdown
ContributorAuthor

Yes, unfortunately this enum is inside the query.
I was wondering what to do here, since support for objects in query also is not yet supported
As a next step we could add object and enum support in queries/headers

@etherealjoy

Copy link
Copy Markdown
ContributorAuthor

@stkrwork@MartinDelille@fvarose@ravinikam
Any objections if we go ahead with this and add improvements later?

@wing328

Copy link
Copy Markdown
Member

Any objections if we go ahead with this and add improvements later?

Let's go with this approach.

@wing328
wing328 merged commit 3bb4edf into OpenAPITools:masterMar 30, 2019
@etherealjoy
etherealjoy deleted the cppqt5_enum_support branch March 30, 2019 08:46
@etherealjoyetherealjoy added this to the 4.0.0 milestone Mar 30, 2019
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request Apr 1, 2019
* master: (48 commits)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (OpenAPITools#2522)
OpenAPITools#1023 - [Scala] Use status family during response processing (OpenAPITools#1024)
Generate setters for readonly properties in server code (OpenAPITools#1582)
[JS] fix NPE for null string and improve Travis config file (OpenAPITools#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (OpenAPITools#2545)
[csharp] update sample after OpenAPITools#2528 (OpenAPITools#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (OpenAPITools#2511)
Aspnetcore nullable support (OpenAPITools#2529)
Csharp nullable support (OpenAPITools#2528)
[C++] [Qt5] Add enum support for client and server (OpenAPITools#2339)
Fixed typo in migration-from-swagger-codegen.md (OpenAPITools#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (OpenAPITools#2514)
[KOTLIN] fix var name not correctly sanitized (OpenAPITools#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (OpenAPITools#2262)
Add @karismann to Java and Kotlin technical committee (OpenAPITools#2542)
Add GoDaddy to the list of companies using OpenAPI Generator (OpenAPITools#2541)
[Kotlin SpringBoot Server] alternative: fix optional parameter not correctly declared in service (OpenAPITools#2539)
improve indentation, update dependencies (OpenAPITools#2521)
update kotlin spring samples
[JAVA] Use specified data type in enum's fromValue instead of string (OpenAPITools#2347)
...
jimschubert added a commit that referenced this pull request Apr 2, 2019
* master: (133 commits)
#2503: fix out-of-memory issue with nested objects with arrays with maxItems set by limiting to max. 5 example items (#2536)
remove emitDefaultValue option (#2559)
fix EmitDefaultValue default vallue with false (#2558)
Added API Key auth to rust-server (#2459)
remove initialCaps and replace with camelize (#2546)
Add packageName configuration to maven (#2429)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (#2522)
#1023 - [Scala] Use status family during response processing (#1024)
Generate setters for readonly properties in server code (#1582)
[JS] fix NPE for null string and improve Travis config file (#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (#2545)
[csharp] update sample after #2528 (#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (#2511)
Aspnetcore nullable support (#2529)
Csharp nullable support (#2528)
[C++] [Qt5] Add enum support for client and server (#2339)
Fixed typo in migration-from-swagger-codegen.md (#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (#2514)
[KOTLIN] fix var name not correctly sanitized (#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (#2262)
...
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.

3 participants

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

[C++] [Qt5] Add enum support for client and server - #2339

Merged
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support
Mar 30, 2019
Merged

[C++] [Qt5] Add enum support for client and server#2339
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support

Conversation

@etherealjoy

@etherealjoyetherealjoy commented Mar 9, 2019

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, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{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\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

  • add support for enum for Qt5 client and server
  • extend tests for Qt5 client

Spec used for testing client and server

---
# This is a sample Swagger spec, describing a simple API as a starting point.swagger: "2.0"info:
description: Template Descriptionversion: 1.0.0title: Testspechost: 0.0.0.0:8080basePath: /apischemes:
- httppaths:
/v1.0/testintenum:
get:
description: ""operationId: testintenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum:
get:
description: ""operationId: teststringenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/testintenum1:
get:
description: ""operationId: testintenum1responses:
200:
description: "Successful response"schema:
type: objectadditionalProperties: $ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum1:
get:
description: ""operationId: teststringenum1responses:
200:
description: "Successful response"schema:
type: arrayitems:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/test:
get:
description: ""operationId: testresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/enumeration'400:
description: "The request was not successfully executed."definitions:
stringEnum:
description: "string enum"enum:
- abc
- def
- ghitype: stringintEnum:
description: "integer enum"enum:
- 1
- 2
- 3type: integerenumeration:
type: objectdescription: "string enum"properties:
enint:
$ref: '#/definitions/intEnum'enstr:
$ref: '#/definitions/stringEnum'enarr:
type: arrayitems:
$ref: '#/definitions/stringEnum'enaobj:
type: objectadditionalProperties:
$ref: '#/definitions/intEnum'

cc:
@stkrwork@MartinDelille@fvarose@ravinikam

@MartinDelilleMartinDelille left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at your PR by executing the openapi 3 script
locally and I wondered why the petstore example wasn't updated accordingly since it declare enum like here: https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml#L74-L77

@etherealjoy

etherealjoy commented Mar 16, 2019

Copy link
Copy Markdown
ContributorAuthor

Yes, unfortunately this enum is inside the query.
I was wondering what to do here, since support for objects in query also is not yet supported
As a next step we could add object and enum support in queries/headers

@etherealjoy

Copy link
Copy Markdown
ContributorAuthor

@stkrwork@MartinDelille@fvarose@ravinikam
Any objections if we go ahead with this and add improvements later?

@wing328

Copy link
Copy Markdown
Member

Any objections if we go ahead with this and add improvements later?

Let's go with this approach.

@wing328
wing328 merged commit 3bb4edf into OpenAPITools:masterMar 30, 2019
@etherealjoy
etherealjoy deleted the cppqt5_enum_support branch March 30, 2019 08:46
@etherealjoyetherealjoy added this to the 4.0.0 milestone Mar 30, 2019
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request Apr 1, 2019
* master: (48 commits)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (OpenAPITools#2522)
OpenAPITools#1023 - [Scala] Use status family during response processing (OpenAPITools#1024)
Generate setters for readonly properties in server code (OpenAPITools#1582)
[JS] fix NPE for null string and improve Travis config file (OpenAPITools#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (OpenAPITools#2545)
[csharp] update sample after OpenAPITools#2528 (OpenAPITools#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (OpenAPITools#2511)
Aspnetcore nullable support (OpenAPITools#2529)
Csharp nullable support (OpenAPITools#2528)
[C++] [Qt5] Add enum support for client and server (OpenAPITools#2339)
Fixed typo in migration-from-swagger-codegen.md (OpenAPITools#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (OpenAPITools#2514)
[KOTLIN] fix var name not correctly sanitized (OpenAPITools#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (OpenAPITools#2262)
Add @karismann to Java and Kotlin technical committee (OpenAPITools#2542)
Add GoDaddy to the list of companies using OpenAPI Generator (OpenAPITools#2541)
[Kotlin SpringBoot Server] alternative: fix optional parameter not correctly declared in service (OpenAPITools#2539)
improve indentation, update dependencies (OpenAPITools#2521)
update kotlin spring samples
[JAVA] Use specified data type in enum's fromValue instead of string (OpenAPITools#2347)
...
jimschubert added a commit that referenced this pull request Apr 2, 2019
* master: (133 commits)
#2503: fix out-of-memory issue with nested objects with arrays with maxItems set by limiting to max. 5 example items (#2536)
remove emitDefaultValue option (#2559)
fix EmitDefaultValue default vallue with false (#2558)
Added API Key auth to rust-server (#2459)
remove initialCaps and replace with camelize (#2546)
Add packageName configuration to maven (#2429)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (#2522)
#1023 - [Scala] Use status family during response processing (#1024)
Generate setters for readonly properties in server code (#1582)
[JS] fix NPE for null string and improve Travis config file (#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (#2545)
[csharp] update sample after #2528 (#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (#2511)
Aspnetcore nullable support (#2529)
Csharp nullable support (#2528)
[C++] [Qt5] Add enum support for client and server (#2339)
Fixed typo in migration-from-swagger-codegen.md (#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (#2514)
[KOTLIN] fix var name not correctly sanitized (#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (#2262)
...
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.

3 participants

@etherealjoy@wing328@MartinDelille
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [C++] [Qt5] Add enum support for client and server by etherealjoy · Pull Request #2339 · OpenAPITools/openapi-generator · GitHub
Skip to content

[C++] [Qt5] Add enum support for client and server - #2339

Merged
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support
Mar 30, 2019
Merged

[C++] [Qt5] Add enum support for client and server#2339
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support

Conversation

@etherealjoy

@etherealjoyetherealjoy commented Mar 9, 2019

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, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{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\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

  • add support for enum for Qt5 client and server
  • extend tests for Qt5 client

Spec used for testing client and server

---
# This is a sample Swagger spec, describing a simple API as a starting point.swagger: "2.0"info:
description: Template Descriptionversion: 1.0.0title: Testspechost: 0.0.0.0:8080basePath: /apischemes:
- httppaths:
/v1.0/testintenum:
get:
description: ""operationId: testintenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum:
get:
description: ""operationId: teststringenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/testintenum1:
get:
description: ""operationId: testintenum1responses:
200:
description: "Successful response"schema:
type: objectadditionalProperties: $ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum1:
get:
description: ""operationId: teststringenum1responses:
200:
description: "Successful response"schema:
type: arrayitems:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/test:
get:
description: ""operationId: testresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/enumeration'400:
description: "The request was not successfully executed."definitions:
stringEnum:
description: "string enum"enum:
- abc
- def
- ghitype: stringintEnum:
description: "integer enum"enum:
- 1
- 2
- 3type: integerenumeration:
type: objectdescription: "string enum"properties:
enint:
$ref: '#/definitions/intEnum'enstr:
$ref: '#/definitions/stringEnum'enarr:
type: arrayitems:
$ref: '#/definitions/stringEnum'enaobj:
type: objectadditionalProperties:
$ref: '#/definitions/intEnum'

cc:
@stkrwork@MartinDelille@fvarose@ravinikam

@MartinDelilleMartinDelille left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at your PR by executing the openapi 3 script
locally and I wondered why the petstore example wasn't updated accordingly since it declare enum like here: https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml#L74-L77

@etherealjoy

etherealjoy commented Mar 16, 2019

Copy link
Copy Markdown
ContributorAuthor

Yes, unfortunately this enum is inside the query.
I was wondering what to do here, since support for objects in query also is not yet supported
As a next step we could add object and enum support in queries/headers

@etherealjoy

Copy link
Copy Markdown
ContributorAuthor

@stkrwork@MartinDelille@fvarose@ravinikam
Any objections if we go ahead with this and add improvements later?

@wing328

Copy link
Copy Markdown
Member

Any objections if we go ahead with this and add improvements later?

Let's go with this approach.

@wing328
wing328 merged commit 3bb4edf into OpenAPITools:masterMar 30, 2019
@etherealjoy
etherealjoy deleted the cppqt5_enum_support branch March 30, 2019 08:46
@etherealjoyetherealjoy added this to the 4.0.0 milestone Mar 30, 2019
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request Apr 1, 2019
* master: (48 commits)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (OpenAPITools#2522)
OpenAPITools#1023 - [Scala] Use status family during response processing (OpenAPITools#1024)
Generate setters for readonly properties in server code (OpenAPITools#1582)
[JS] fix NPE for null string and improve Travis config file (OpenAPITools#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (OpenAPITools#2545)
[csharp] update sample after OpenAPITools#2528 (OpenAPITools#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (OpenAPITools#2511)
Aspnetcore nullable support (OpenAPITools#2529)
Csharp nullable support (OpenAPITools#2528)
[C++] [Qt5] Add enum support for client and server (OpenAPITools#2339)
Fixed typo in migration-from-swagger-codegen.md (OpenAPITools#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (OpenAPITools#2514)
[KOTLIN] fix var name not correctly sanitized (OpenAPITools#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (OpenAPITools#2262)
Add @karismann to Java and Kotlin technical committee (OpenAPITools#2542)
Add GoDaddy to the list of companies using OpenAPI Generator (OpenAPITools#2541)
[Kotlin SpringBoot Server] alternative: fix optional parameter not correctly declared in service (OpenAPITools#2539)
improve indentation, update dependencies (OpenAPITools#2521)
update kotlin spring samples
[JAVA] Use specified data type in enum's fromValue instead of string (OpenAPITools#2347)
...
jimschubert added a commit that referenced this pull request Apr 2, 2019
* master: (133 commits)
#2503: fix out-of-memory issue with nested objects with arrays with maxItems set by limiting to max. 5 example items (#2536)
remove emitDefaultValue option (#2559)
fix EmitDefaultValue default vallue with false (#2558)
Added API Key auth to rust-server (#2459)
remove initialCaps and replace with camelize (#2546)
Add packageName configuration to maven (#2429)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (#2522)
#1023 - [Scala] Use status family during response processing (#1024)
Generate setters for readonly properties in server code (#1582)
[JS] fix NPE for null string and improve Travis config file (#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (#2545)
[csharp] update sample after #2528 (#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (#2511)
Aspnetcore nullable support (#2529)
Csharp nullable support (#2528)
[C++] [Qt5] Add enum support for client and server (#2339)
Fixed typo in migration-from-swagger-codegen.md (#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (#2514)
[KOTLIN] fix var name not correctly sanitized (#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (#2262)
...
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.

3 participants

@etherealjoy@wing328@MartinDelille
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [C++] [Qt5] Add enum support for client and server by etherealjoy · Pull Request #2339 · OpenAPITools/openapi-generator · GitHub
Skip to content

[C++] [Qt5] Add enum support for client and server - #2339

Merged
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support
Mar 30, 2019
Merged

[C++] [Qt5] Add enum support for client and server#2339
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support

Conversation

@etherealjoy

@etherealjoyetherealjoy commented Mar 9, 2019

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, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{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\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

  • add support for enum for Qt5 client and server
  • extend tests for Qt5 client

Spec used for testing client and server

---
# This is a sample Swagger spec, describing a simple API as a starting point.swagger: "2.0"info:
description: Template Descriptionversion: 1.0.0title: Testspechost: 0.0.0.0:8080basePath: /apischemes:
- httppaths:
/v1.0/testintenum:
get:
description: ""operationId: testintenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum:
get:
description: ""operationId: teststringenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/testintenum1:
get:
description: ""operationId: testintenum1responses:
200:
description: "Successful response"schema:
type: objectadditionalProperties: $ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum1:
get:
description: ""operationId: teststringenum1responses:
200:
description: "Successful response"schema:
type: arrayitems:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/test:
get:
description: ""operationId: testresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/enumeration'400:
description: "The request was not successfully executed."definitions:
stringEnum:
description: "string enum"enum:
- abc
- def
- ghitype: stringintEnum:
description: "integer enum"enum:
- 1
- 2
- 3type: integerenumeration:
type: objectdescription: "string enum"properties:
enint:
$ref: '#/definitions/intEnum'enstr:
$ref: '#/definitions/stringEnum'enarr:
type: arrayitems:
$ref: '#/definitions/stringEnum'enaobj:
type: objectadditionalProperties:
$ref: '#/definitions/intEnum'

cc:
@stkrwork@MartinDelille@fvarose@ravinikam

@MartinDelilleMartinDelille left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at your PR by executing the openapi 3 script
locally and I wondered why the petstore example wasn't updated accordingly since it declare enum like here: https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml#L74-L77

@etherealjoy

etherealjoy commented Mar 16, 2019

Copy link
Copy Markdown
ContributorAuthor

Yes, unfortunately this enum is inside the query.
I was wondering what to do here, since support for objects in query also is not yet supported
As a next step we could add object and enum support in queries/headers

@etherealjoy

Copy link
Copy Markdown
ContributorAuthor

@stkrwork@MartinDelille@fvarose@ravinikam
Any objections if we go ahead with this and add improvements later?

@wing328

Copy link
Copy Markdown
Member

Any objections if we go ahead with this and add improvements later?

Let's go with this approach.

@wing328
wing328 merged commit 3bb4edf into OpenAPITools:masterMar 30, 2019
@etherealjoy
etherealjoy deleted the cppqt5_enum_support branch March 30, 2019 08:46
@etherealjoyetherealjoy added this to the 4.0.0 milestone Mar 30, 2019
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request Apr 1, 2019
* master: (48 commits)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (OpenAPITools#2522)
OpenAPITools#1023 - [Scala] Use status family during response processing (OpenAPITools#1024)
Generate setters for readonly properties in server code (OpenAPITools#1582)
[JS] fix NPE for null string and improve Travis config file (OpenAPITools#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (OpenAPITools#2545)
[csharp] update sample after OpenAPITools#2528 (OpenAPITools#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (OpenAPITools#2511)
Aspnetcore nullable support (OpenAPITools#2529)
Csharp nullable support (OpenAPITools#2528)
[C++] [Qt5] Add enum support for client and server (OpenAPITools#2339)
Fixed typo in migration-from-swagger-codegen.md (OpenAPITools#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (OpenAPITools#2514)
[KOTLIN] fix var name not correctly sanitized (OpenAPITools#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (OpenAPITools#2262)
Add @karismann to Java and Kotlin technical committee (OpenAPITools#2542)
Add GoDaddy to the list of companies using OpenAPI Generator (OpenAPITools#2541)
[Kotlin SpringBoot Server] alternative: fix optional parameter not correctly declared in service (OpenAPITools#2539)
improve indentation, update dependencies (OpenAPITools#2521)
update kotlin spring samples
[JAVA] Use specified data type in enum's fromValue instead of string (OpenAPITools#2347)
...
jimschubert added a commit that referenced this pull request Apr 2, 2019
* master: (133 commits)
#2503: fix out-of-memory issue with nested objects with arrays with maxItems set by limiting to max. 5 example items (#2536)
remove emitDefaultValue option (#2559)
fix EmitDefaultValue default vallue with false (#2558)
Added API Key auth to rust-server (#2459)
remove initialCaps and replace with camelize (#2546)
Add packageName configuration to maven (#2429)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (#2522)
#1023 - [Scala] Use status family during response processing (#1024)
Generate setters for readonly properties in server code (#1582)
[JS] fix NPE for null string and improve Travis config file (#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (#2545)
[csharp] update sample after #2528 (#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (#2511)
Aspnetcore nullable support (#2529)
Csharp nullable support (#2528)
[C++] [Qt5] Add enum support for client and server (#2339)
Fixed typo in migration-from-swagger-codegen.md (#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (#2514)
[KOTLIN] fix var name not correctly sanitized (#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (#2262)
...
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.

3 participants

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

[C++] [Qt5] Add enum support for client and server - #2339

Merged
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support
Mar 30, 2019
Merged

[C++] [Qt5] Add enum support for client and server#2339
wing328 merged 4 commits into
OpenAPITools:masterfrom
etherealjoy:cppqt5_enum_support

Conversation

@etherealjoy

@etherealjoyetherealjoy commented Mar 9, 2019

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, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{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\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

  • add support for enum for Qt5 client and server
  • extend tests for Qt5 client

Spec used for testing client and server

---
# This is a sample Swagger spec, describing a simple API as a starting point.swagger: "2.0"info:
description: Template Descriptionversion: 1.0.0title: Testspechost: 0.0.0.0:8080basePath: /apischemes:
- httppaths:
/v1.0/testintenum:
get:
description: ""operationId: testintenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum:
get:
description: ""operationId: teststringenumresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/testintenum1:
get:
description: ""operationId: testintenum1responses:
200:
description: "Successful response"schema:
type: objectadditionalProperties: $ref: '#/definitions/intEnum'400:
description: "The request was not successfully executed."/v1.0/teststringenum1:
get:
description: ""operationId: teststringenum1responses:
200:
description: "Successful response"schema:
type: arrayitems:
$ref: '#/definitions/stringEnum'400:
description: "The request was not successfully executed."/v1.0/test:
get:
description: ""operationId: testresponses:
200:
description: "Successful response"schema:
$ref: '#/definitions/enumeration'400:
description: "The request was not successfully executed."definitions:
stringEnum:
description: "string enum"enum:
- abc
- def
- ghitype: stringintEnum:
description: "integer enum"enum:
- 1
- 2
- 3type: integerenumeration:
type: objectdescription: "string enum"properties:
enint:
$ref: '#/definitions/intEnum'enstr:
$ref: '#/definitions/stringEnum'enarr:
type: arrayitems:
$ref: '#/definitions/stringEnum'enaobj:
type: objectadditionalProperties:
$ref: '#/definitions/intEnum'

cc:
@stkrwork@MartinDelille@fvarose@ravinikam

@MartinDelilleMartinDelille left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at your PR by executing the openapi 3 script
locally and I wondered why the petstore example wasn't updated accordingly since it declare enum like here: https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml#L74-L77

@etherealjoy

etherealjoy commented Mar 16, 2019

Copy link
Copy Markdown
ContributorAuthor

Yes, unfortunately this enum is inside the query.
I was wondering what to do here, since support for objects in query also is not yet supported
As a next step we could add object and enum support in queries/headers

@etherealjoy

Copy link
Copy Markdown
ContributorAuthor

@stkrwork@MartinDelille@fvarose@ravinikam
Any objections if we go ahead with this and add improvements later?

@wing328

Copy link
Copy Markdown
Member

Any objections if we go ahead with this and add improvements later?

Let's go with this approach.

@wing328
wing328 merged commit 3bb4edf into OpenAPITools:masterMar 30, 2019
@etherealjoy
etherealjoy deleted the cppqt5_enum_support branch March 30, 2019 08:46
@etherealjoyetherealjoy added this to the 4.0.0 milestone Mar 30, 2019
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request Apr 1, 2019
* master: (48 commits)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (OpenAPITools#2522)
OpenAPITools#1023 - [Scala] Use status family during response processing (OpenAPITools#1024)
Generate setters for readonly properties in server code (OpenAPITools#1582)
[JS] fix NPE for null string and improve Travis config file (OpenAPITools#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (OpenAPITools#2545)
[csharp] update sample after OpenAPITools#2528 (OpenAPITools#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (OpenAPITools#2511)
Aspnetcore nullable support (OpenAPITools#2529)
Csharp nullable support (OpenAPITools#2528)
[C++] [Qt5] Add enum support for client and server (OpenAPITools#2339)
Fixed typo in migration-from-swagger-codegen.md (OpenAPITools#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (OpenAPITools#2514)
[KOTLIN] fix var name not correctly sanitized (OpenAPITools#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (OpenAPITools#2262)
Add @karismann to Java and Kotlin technical committee (OpenAPITools#2542)
Add GoDaddy to the list of companies using OpenAPI Generator (OpenAPITools#2541)
[Kotlin SpringBoot Server] alternative: fix optional parameter not correctly declared in service (OpenAPITools#2539)
improve indentation, update dependencies (OpenAPITools#2521)
update kotlin spring samples
[JAVA] Use specified data type in enum's fromValue instead of string (OpenAPITools#2347)
...
jimschubert added a commit that referenced this pull request Apr 2, 2019
* master: (133 commits)
#2503: fix out-of-memory issue with nested objects with arrays with maxItems set by limiting to max. 5 example items (#2536)
remove emitDefaultValue option (#2559)
fix EmitDefaultValue default vallue with false (#2558)
Added API Key auth to rust-server (#2459)
remove initialCaps and replace with camelize (#2546)
Add packageName configuration to maven (#2429)
[Typescript AngularJS] fix Extra package prefix in api parameters operations (#2522)
#1023 - [Scala] Use status family during response processing (#1024)
Generate setters for readonly properties in server code (#1582)
[JS] fix NPE for null string and improve Travis config file (#2553)
[elm] Update ISO 8601 library (fixes missing time zone designator) (#2545)
[csharp] update sample after #2528 (#2550)
[JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (#2511)
Aspnetcore nullable support (#2529)
Csharp nullable support (#2528)
[C++] [Qt5] Add enum support for client and server (#2339)
Fixed typo in migration-from-swagger-codegen.md (#2548)
[TypeScript Client] fix install Aurelia + fix use deprecated function (#2514)
[KOTLIN] fix var name not correctly sanitized (#2537)
Update swagger-parser to '2.0.11-OpenAPITools.org-1' (#2262)
...
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.

3 participants

@etherealjoy@wing328@MartinDelille