Skip to content

Fix issue deserializing to nullptr - #3572

Merged
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master
Aug 8, 2019
Merged

Fix issue deserializing to nullptr#3572
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master

Conversation

@dan-drl

@dan-drldan-drl commented Aug 6, 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 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.

Description of the PR

This addresses bug #3374. In the test json provided for this bug, there is an edge case that allows null pointers to occur. The edge case occurs because the value property is both nullable:true and required.

@ravinikam@stkrwork@fvarose@etherealjoy@MartinDelille

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR. For your upcoming PRs, I would suggest creating a new branch for the change.

@wing328wing328 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The additional null check looks reasonable to me.

@wing328
wing328 merged commit 7520308 into OpenAPITools:masterAug 8, 2019
@wing328wing328 added this to the 4.1.0 milestone Aug 9, 2019
@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553

jimschubert added a commit that referenced this pull request Aug 11, 2019
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@TomerJLevy

Copy link
Copy Markdown

Hi,

In 'openapi-generator/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp':

You should use:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

instead of:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(L"NULL", utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

Because 'string_t' may be std::string or std::wstring and it fails to compile if std::string

@etherealjoy

Copy link
Copy Markdown
Contributor

@TomerJLevy
Thanks for pointing this out, do you wish to make a contribution by creating a new PR for this?
Or we can take this snippet and make a PR.

@TomerJLevy

Copy link
Copy Markdown

Fix - commit 2c95d10

@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks again for the PR. When you've time, can you please contact me via the email address in my Github profile?

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

@dan-drl@wing328@TomerJLevy@etherealjoy
, '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" + '
Fix issue deserializing to nullptr by dan-drl · Pull Request #3572 · OpenAPITools/openapi-generator · GitHub
Skip to content

Fix issue deserializing to nullptr - #3572

Merged
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master
Aug 8, 2019
Merged

Fix issue deserializing to nullptr#3572
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master

Conversation

@dan-drl

@dan-drldan-drl commented Aug 6, 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 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.

Description of the PR

This addresses bug #3374. In the test json provided for this bug, there is an edge case that allows null pointers to occur. The edge case occurs because the value property is both nullable:true and required.

@ravinikam@stkrwork@fvarose@etherealjoy@MartinDelille

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR. For your upcoming PRs, I would suggest creating a new branch for the change.

@wing328wing328 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The additional null check looks reasonable to me.

@wing328
wing328 merged commit 7520308 into OpenAPITools:masterAug 8, 2019
@wing328wing328 added this to the 4.1.0 milestone Aug 9, 2019
@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553

jimschubert added a commit that referenced this pull request Aug 11, 2019
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@TomerJLevy

Copy link
Copy Markdown

Hi,

In 'openapi-generator/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp':

You should use:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

instead of:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(L"NULL", utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

Because 'string_t' may be std::string or std::wstring and it fails to compile if std::string

@etherealjoy

Copy link
Copy Markdown
Contributor

@TomerJLevy
Thanks for pointing this out, do you wish to make a contribution by creating a new PR for this?
Or we can take this snippet and make a PR.

@TomerJLevy

Copy link
Copy Markdown

Fix - commit 2c95d10

@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks again for the PR. When you've time, can you please contact me via the email address in my Github profile?

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

@dan-drl@wing328@TomerJLevy@etherealjoy
, '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('^' + ".*" + ' Fix issue deserializing to nullptr by dan-drl · Pull Request #3572 · OpenAPITools/openapi-generator · GitHub
Skip to content

Fix issue deserializing to nullptr - #3572

Merged
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master
Aug 8, 2019
Merged

Fix issue deserializing to nullptr#3572
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master

Conversation

@dan-drl

@dan-drldan-drl commented Aug 6, 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 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.

Description of the PR

This addresses bug #3374. In the test json provided for this bug, there is an edge case that allows null pointers to occur. The edge case occurs because the value property is both nullable:true and required.

@ravinikam@stkrwork@fvarose@etherealjoy@MartinDelille

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR. For your upcoming PRs, I would suggest creating a new branch for the change.

@wing328wing328 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The additional null check looks reasonable to me.

@wing328
wing328 merged commit 7520308 into OpenAPITools:masterAug 8, 2019
@wing328wing328 added this to the 4.1.0 milestone Aug 9, 2019
@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553

jimschubert added a commit that referenced this pull request Aug 11, 2019
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@TomerJLevy

Copy link
Copy Markdown

Hi,

In 'openapi-generator/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp':

You should use:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

instead of:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(L"NULL", utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

Because 'string_t' may be std::string or std::wstring and it fails to compile if std::string

@etherealjoy

Copy link
Copy Markdown
Contributor

@TomerJLevy
Thanks for pointing this out, do you wish to make a contribution by creating a new PR for this?
Or we can take this snippet and make a PR.

@TomerJLevy

Copy link
Copy Markdown

Fix - commit 2c95d10

@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks again for the PR. When you've time, can you please contact me via the email address in my Github profile?

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

@dan-drl@wing328@TomerJLevy@etherealjoy
, '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('^' + ".*" + ' Fix issue deserializing to nullptr by dan-drl · Pull Request #3572 · OpenAPITools/openapi-generator · GitHub
Skip to content

Fix issue deserializing to nullptr - #3572

Merged
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master
Aug 8, 2019
Merged

Fix issue deserializing to nullptr#3572
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master

Conversation

@dan-drl

@dan-drldan-drl commented Aug 6, 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 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.

Description of the PR

This addresses bug #3374. In the test json provided for this bug, there is an edge case that allows null pointers to occur. The edge case occurs because the value property is both nullable:true and required.

@ravinikam@stkrwork@fvarose@etherealjoy@MartinDelille

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR. For your upcoming PRs, I would suggest creating a new branch for the change.

@wing328wing328 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The additional null check looks reasonable to me.

@wing328
wing328 merged commit 7520308 into OpenAPITools:masterAug 8, 2019
@wing328wing328 added this to the 4.1.0 milestone Aug 9, 2019
@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553

jimschubert added a commit that referenced this pull request Aug 11, 2019
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@TomerJLevy

Copy link
Copy Markdown

Hi,

In 'openapi-generator/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp':

You should use:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

instead of:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(L"NULL", utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

Because 'string_t' may be std::string or std::wstring and it fails to compile if std::string

@etherealjoy

Copy link
Copy Markdown
Contributor

@TomerJLevy
Thanks for pointing this out, do you wish to make a contribution by creating a new PR for this?
Or we can take this snippet and make a PR.

@TomerJLevy

Copy link
Copy Markdown

Fix - commit 2c95d10

@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks again for the PR. When you've time, can you please contact me via the email address in my Github profile?

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

@dan-drl@wing328@TomerJLevy@etherealjoy
, '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" + ' Fix issue deserializing to nullptr by dan-drl · Pull Request #3572 · OpenAPITools/openapi-generator · GitHub
Skip to content

Fix issue deserializing to nullptr - #3572

Merged
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master
Aug 8, 2019
Merged

Fix issue deserializing to nullptr#3572
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master

Conversation

@dan-drl

@dan-drldan-drl commented Aug 6, 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 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.

Description of the PR

This addresses bug #3374. In the test json provided for this bug, there is an edge case that allows null pointers to occur. The edge case occurs because the value property is both nullable:true and required.

@ravinikam@stkrwork@fvarose@etherealjoy@MartinDelille

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR. For your upcoming PRs, I would suggest creating a new branch for the change.

@wing328wing328 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The additional null check looks reasonable to me.

@wing328
wing328 merged commit 7520308 into OpenAPITools:masterAug 8, 2019
@wing328wing328 added this to the 4.1.0 milestone Aug 9, 2019
@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553

jimschubert added a commit that referenced this pull request Aug 11, 2019
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@TomerJLevy

Copy link
Copy Markdown

Hi,

In 'openapi-generator/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp':

You should use:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

instead of:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(L"NULL", utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

Because 'string_t' may be std::string or std::wstring and it fails to compile if std::string

@etherealjoy

Copy link
Copy Markdown
Contributor

@TomerJLevy
Thanks for pointing this out, do you wish to make a contribution by creating a new PR for this?
Or we can take this snippet and make a PR.

@TomerJLevy

Copy link
Copy Markdown

Fix - commit 2c95d10

@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks again for the PR. When you've time, can you please contact me via the email address in my Github profile?

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

@dan-drl@wing328@TomerJLevy@etherealjoy
, '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('^' + ".*" + ' Fix issue deserializing to nullptr by dan-drl · Pull Request #3572 · OpenAPITools/openapi-generator · GitHub
Skip to content

Fix issue deserializing to nullptr - #3572

Merged
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master
Aug 8, 2019
Merged

Fix issue deserializing to nullptr#3572
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master

Conversation

@dan-drl

@dan-drldan-drl commented Aug 6, 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 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.

Description of the PR

This addresses bug #3374. In the test json provided for this bug, there is an edge case that allows null pointers to occur. The edge case occurs because the value property is both nullable:true and required.

@ravinikam@stkrwork@fvarose@etherealjoy@MartinDelille

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR. For your upcoming PRs, I would suggest creating a new branch for the change.

@wing328wing328 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The additional null check looks reasonable to me.

@wing328
wing328 merged commit 7520308 into OpenAPITools:masterAug 8, 2019
@wing328wing328 added this to the 4.1.0 milestone Aug 9, 2019
@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553

jimschubert added a commit that referenced this pull request Aug 11, 2019
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@TomerJLevy

Copy link
Copy Markdown

Hi,

In 'openapi-generator/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp':

You should use:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

instead of:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(L"NULL", utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

Because 'string_t' may be std::string or std::wstring and it fails to compile if std::string

@etherealjoy

Copy link
Copy Markdown
Contributor

@TomerJLevy
Thanks for pointing this out, do you wish to make a contribution by creating a new PR for this?
Or we can take this snippet and make a PR.

@TomerJLevy

Copy link
Copy Markdown

Fix - commit 2c95d10

@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks again for the PR. When you've time, can you please contact me via the email address in my Github profile?

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

@dan-drl@wing328@TomerJLevy@etherealjoy
, '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('^' + ".*" + ' Fix issue deserializing to nullptr by dan-drl · Pull Request #3572 · OpenAPITools/openapi-generator · GitHub
Skip to content

Fix issue deserializing to nullptr - #3572

Merged
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master
Aug 8, 2019
Merged

Fix issue deserializing to nullptr#3572
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master

Conversation

@dan-drl

@dan-drldan-drl commented Aug 6, 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 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.

Description of the PR

This addresses bug #3374. In the test json provided for this bug, there is an edge case that allows null pointers to occur. The edge case occurs because the value property is both nullable:true and required.

@ravinikam@stkrwork@fvarose@etherealjoy@MartinDelille

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR. For your upcoming PRs, I would suggest creating a new branch for the change.

@wing328wing328 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The additional null check looks reasonable to me.

@wing328
wing328 merged commit 7520308 into OpenAPITools:masterAug 8, 2019
@wing328wing328 added this to the 4.1.0 milestone Aug 9, 2019
@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553

jimschubert added a commit that referenced this pull request Aug 11, 2019
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@TomerJLevy

Copy link
Copy Markdown

Hi,

In 'openapi-generator/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp':

You should use:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

instead of:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(L"NULL", utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

Because 'string_t' may be std::string or std::wstring and it fails to compile if std::string

@etherealjoy

Copy link
Copy Markdown
Contributor

@TomerJLevy
Thanks for pointing this out, do you wish to make a contribution by creating a new PR for this?
Or we can take this snippet and make a PR.

@TomerJLevy

Copy link
Copy Markdown

Fix - commit 2c95d10

@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks again for the PR. When you've time, can you please contact me via the email address in my Github profile?

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

@dan-drl@wing328@TomerJLevy@etherealjoy
, '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); } })(); })(); Fix issue deserializing to nullptr by dan-drl · Pull Request #3572 · OpenAPITools/openapi-generator · GitHub
Skip to content

Fix issue deserializing to nullptr - #3572

Merged
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master
Aug 8, 2019
Merged

Fix issue deserializing to nullptr#3572
wing328 merged 2 commits into
OpenAPITools:masterfrom
dan-drl:master

Conversation

@dan-drl

@dan-drldan-drl commented Aug 6, 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 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.

Description of the PR

This addresses bug #3374. In the test json provided for this bug, there is an edge case that allows null pointers to occur. The edge case occurs because the value property is both nullable:true and required.

@ravinikam@stkrwork@fvarose@etherealjoy@MartinDelille

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR. For your upcoming PRs, I would suggest creating a new branch for the change.

@wing328wing328 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The additional null check looks reasonable to me.

@wing328
wing328 merged commit 7520308 into OpenAPITools:masterAug 8, 2019
@wing328wing328 added this to the 4.1.0 milestone Aug 9, 2019
@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553

jimschubert added a commit that referenced this pull request Aug 11, 2019
* master: (122 commits)
Fix#3604 by adding undefined as return type to headers and credentials methods in runtime.ts (#3605)
Prepare 4.1.1-SNAPSHOT (#3603)
Prepare 4.1.0 release (#3597)
[java][client][jax-rs] Add a constant for Jackson @JsonProperty (#3560)
restore openapi3 petstore.yaml (#3590)
Add a new NodeJS Express server generator (#3567)
[C#][client][csharp-netcore] Fix csharp netcore defaultheaders (#3562)
Fix issue deserializing to nullptr (#3572)
[OCaml] Add file post-processing (#3583)
[dart2] Fix up test code generation, double deserialization, 'new' keyword deprecation (#3576)
Run Qt5 client sample test (#3415)
typescript-fetch: allow configuration of headers and credentials (#3586)
using partials in ruby api_client (#3564)
[OCaml] Added optional params support in API operations (#3568)
[Rust Server] Generate valid Rustdocs for lazy_static items (#3556)
Fix NPM build for Typescript-fetch (#3403)
Expand path templates via resttemplate's uriTemplateHandler (#3500)
Readme updated with a new tutorial and company using OpenAPI Generator (#3566)
Fix logic of `getNullableType` of csharp server and client. (#3537)
[Ruby] clean up Ruby dev dependencies (#3551)
...
@TomerJLevy

Copy link
Copy Markdown

Hi,

In 'openapi-generator/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp':

You should use:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

instead of:

utility::datetime ModelBase::dateFromJson(const web::json::value& val)
{
return val.is_null() ? utility::datetime::from_string(L"NULL", utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
}

Because 'string_t' may be std::string or std::wstring and it fails to compile if std::string

@etherealjoy

Copy link
Copy Markdown
Contributor

@TomerJLevy
Thanks for pointing this out, do you wish to make a contribution by creating a new PR for this?
Or we can take this snippet and make a PR.

@TomerJLevy

Copy link
Copy Markdown

Fix - commit 2c95d10

@wing328

Copy link
Copy Markdown
Member

@dan-drl thanks again for the PR. When you've time, can you please contact me via the email address in my Github profile?

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

@dan-drl@wing328@TomerJLevy@etherealjoy