[go-experimental] export required fields without pointer - #3989

Merged
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable
Oct 14, 2019
Merged

[go-experimental] export required fields without pointer#3989
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable

Conversation

@shaxbee

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

@bkabrda

Required fields are exposed without pointer, as they cannot be set to nil. This reduces boilerplate and GC pressure.
Omitempty tag is only used for fields that are neither required or nullable. This removes need for private member that breaks struct conversions. This also removes need for custom MarshalJSON that creates intermediary map increasing GC pressure.

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 see two cases where your implementation is problematic:

  • How would this work with a field that is required and nullable? AFAICS you'd have
    Foo int ``json:"foo"`` , but there's no way to serialize the explicit null in this scenario AFAICS.
  • For scenario where you have a non-required nullable field, how do you distinguish when the field is just null because it was initialized that way versus when the user explicitly set it null?

@shaxbeeshaxbeeSep 30, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes I totally agree, there is no differentiation between undefined and null in this case, but at least we don't introduce private members to what should be data only struct.

In case of required and nullable field since omitempty tag is not there nil value will be emitted as null.

To avoid breaking copying and pasting struct we could model this as interface{} and use helper methods or accept the fact that we cannot differentiate between undefined and null till generics land in Go.

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.

As for the required and nullable field, you won't even be able to assign nil, because the type is not pointer - it's Foo int, not Foo *int.

but at least we don't introduce private members to what should be data only struct.

Why should it be a data only structure?

I feel like this is a sacrifice of feature completeness for getting a nicer code, which I'm not in favor of.

@bkabrdabkabrdaSep 30, 2019

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.

(Just to add to my previous point, I'd love to be able to simplify this and I'm all for someone doing that. I just don't think that this PR is sufficient, as it sacrifices feature completeness for a bit less boilerplate (which is generated anyway) and a bit of improvement for GC which I honestly don't think would be noticable. Maybe there's a way to modify this PR to make it cover all the cases (a way that I don't see) and I'd be more than happy to give it a thumbsup if you found it.)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You are correct, it should be pointer type, I will add it.

Regarding copying, if you copy subset of fields instead of whole object information about field being explicitly null is lost. I also think that gc pressure shouldn't be dismissed here, on every marshaling map is allocated and each value is converted into heap-referenced GC object.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

@bkabrdabkabrdaSep 30, 2019

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.

So right now you have

{{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}}

but if you want to export all nullable fields as pointers (as your last commit message suggests), you should do

{{#isNullable}}*{{/isNullable}}{{{dataType}}}

Am I missing somethings?

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

I honestly don't know what you mean by that. Could you provide an example of what this would look like?

@shaxbeeshaxbeeOct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You're absolutely right, required and nullable don't mix well in this case.

Added Nullable types to the templates. I need to probably override dataType in codegen for nullable types. I need to add Get/Set operations for nullable types and SetExplicitNull method.

Nullable types implement their own MarshalJSON/UnmarshalJSON avoiding need for intermediate map.
This approach guarantees that if we copy field value the information about explicit null is not lost, eg.

src:=Foo{}
src.SetBarExplicitNull(true)
dst:=Foo{
Bar: src.Bar
}

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 8971b82 to 5421593CompareSeptember 30, 2019 17:52
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

This is currently broken due to #3988

@etherealjoy

Copy link
Copy Markdown
Contributor

Apparently the master changed when I merged it.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy The build on branch failed and master is broken as well :-(

@etherealjoy

Copy link
Copy Markdown
Contributor

I regenerated it again after rebase. #4000
The #3988 solved some build issue on the test files.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

Thanks a lot! :-)

@wing328

Copy link
Copy Markdown
Member

Updates samples via 3c4f512. Let's see how it goes.

@etherealjoy

Copy link
Copy Markdown
Contributor

a rebase is probably needed right?

@wing328

Copy link
Copy Markdown
Member
rspec ./spec/api_client_spec.rb:158 # Petstore::ApiClient#build_collection_param fails for invalid collection format

We got the same error in the master as well.

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 3c4f512 to e5f3229CompareOctober 3, 2019 22:45
@shaxbee

shaxbee commented Oct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

@wing328 after rebase i'm still getting type generated incorrectly, what command do you use to generate code?

EDIT: fixed itself after mvn package :-)

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from e5f3229 to 73fa582CompareOctober 3, 2019 23:16
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 73fa582 to ad5dafaCompareOctober 3, 2019 23:17
@bkabrda

Copy link
Copy Markdown
Contributor

So I think this is starting to look very promising. It may still require couple of tweaks though; I'll try to do a detailed review during today.

@bkabrdabkabrda 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 left a couple comments inline that I think should be taken care of, but otherwise this looks good. I'll try to test the generated code next, although that will probably take me some more time.

Comment threadmodules/openapi-generator/src/main/resources/go-experimental/model.mustache Outdated
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 4b05f17 to fe7ca62CompareOctober 4, 2019 14:16
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@bkabrda is there anything else left to address?

@wing328
wing328 merged commit 2cab048 into OpenAPITools:masterOct 14, 2019
@wing328

wing328 commented Oct 14, 2019

Copy link
Copy Markdown
Member

@shaxbee sorry for the delay. Just merged it. Thanks for your contribution.

@wing328wing328 added this to the 4.2.0 milestone Oct 30, 2019
@wing328

Copy link
Copy Markdown
Member

@shaxbee thanks for the PR, which has been included in v4.2.0 release: https://twitter.com/oas_generator/status/1189824932345069569

@shaxbee
shaxbee deleted the go-exp-required-fields-nullable branch February 10, 2020 06:56
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

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

[go-experimental] export required fields without pointer - #3989

Merged
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable
Oct 14, 2019
Merged

[go-experimental] export required fields without pointer#3989
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable

Conversation

@shaxbee

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

@bkabrda

Required fields are exposed without pointer, as they cannot be set to nil. This reduces boilerplate and GC pressure.
Omitempty tag is only used for fields that are neither required or nullable. This removes need for private member that breaks struct conversions. This also removes need for custom MarshalJSON that creates intermediary map increasing GC pressure.

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 see two cases where your implementation is problematic:

  • How would this work with a field that is required and nullable? AFAICS you'd have
    Foo int ``json:"foo"`` , but there's no way to serialize the explicit null in this scenario AFAICS.
  • For scenario where you have a non-required nullable field, how do you distinguish when the field is just null because it was initialized that way versus when the user explicitly set it null?

@shaxbeeshaxbeeSep 30, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes I totally agree, there is no differentiation between undefined and null in this case, but at least we don't introduce private members to what should be data only struct.

In case of required and nullable field since omitempty tag is not there nil value will be emitted as null.

To avoid breaking copying and pasting struct we could model this as interface{} and use helper methods or accept the fact that we cannot differentiate between undefined and null till generics land in Go.

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.

As for the required and nullable field, you won't even be able to assign nil, because the type is not pointer - it's Foo int, not Foo *int.

but at least we don't introduce private members to what should be data only struct.

Why should it be a data only structure?

I feel like this is a sacrifice of feature completeness for getting a nicer code, which I'm not in favor of.

@bkabrdabkabrdaSep 30, 2019

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.

(Just to add to my previous point, I'd love to be able to simplify this and I'm all for someone doing that. I just don't think that this PR is sufficient, as it sacrifices feature completeness for a bit less boilerplate (which is generated anyway) and a bit of improvement for GC which I honestly don't think would be noticable. Maybe there's a way to modify this PR to make it cover all the cases (a way that I don't see) and I'd be more than happy to give it a thumbsup if you found it.)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You are correct, it should be pointer type, I will add it.

Regarding copying, if you copy subset of fields instead of whole object information about field being explicitly null is lost. I also think that gc pressure shouldn't be dismissed here, on every marshaling map is allocated and each value is converted into heap-referenced GC object.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

@bkabrdabkabrdaSep 30, 2019

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.

So right now you have

{{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}}

but if you want to export all nullable fields as pointers (as your last commit message suggests), you should do

{{#isNullable}}*{{/isNullable}}{{{dataType}}}

Am I missing somethings?

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

I honestly don't know what you mean by that. Could you provide an example of what this would look like?

@shaxbeeshaxbeeOct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You're absolutely right, required and nullable don't mix well in this case.

Added Nullable types to the templates. I need to probably override dataType in codegen for nullable types. I need to add Get/Set operations for nullable types and SetExplicitNull method.

Nullable types implement their own MarshalJSON/UnmarshalJSON avoiding need for intermediate map.
This approach guarantees that if we copy field value the information about explicit null is not lost, eg.

src:=Foo{}
src.SetBarExplicitNull(true)
dst:=Foo{
Bar: src.Bar
}

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 8971b82 to 5421593CompareSeptember 30, 2019 17:52
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

This is currently broken due to #3988

@etherealjoy

Copy link
Copy Markdown
Contributor

Apparently the master changed when I merged it.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy The build on branch failed and master is broken as well :-(

@etherealjoy

Copy link
Copy Markdown
Contributor

I regenerated it again after rebase. #4000
The #3988 solved some build issue on the test files.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

Thanks a lot! :-)

@wing328

Copy link
Copy Markdown
Member

Updates samples via 3c4f512. Let's see how it goes.

@etherealjoy

Copy link
Copy Markdown
Contributor

a rebase is probably needed right?

@wing328

Copy link
Copy Markdown
Member
rspec ./spec/api_client_spec.rb:158 # Petstore::ApiClient#build_collection_param fails for invalid collection format

We got the same error in the master as well.

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 3c4f512 to e5f3229CompareOctober 3, 2019 22:45
@shaxbee

shaxbee commented Oct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

@wing328 after rebase i'm still getting type generated incorrectly, what command do you use to generate code?

EDIT: fixed itself after mvn package :-)

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from e5f3229 to 73fa582CompareOctober 3, 2019 23:16
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 73fa582 to ad5dafaCompareOctober 3, 2019 23:17
@bkabrda

Copy link
Copy Markdown
Contributor

So I think this is starting to look very promising. It may still require couple of tweaks though; I'll try to do a detailed review during today.

@bkabrdabkabrda 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 left a couple comments inline that I think should be taken care of, but otherwise this looks good. I'll try to test the generated code next, although that will probably take me some more time.

Comment threadmodules/openapi-generator/src/main/resources/go-experimental/model.mustache Outdated
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 4b05f17 to fe7ca62CompareOctober 4, 2019 14:16
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@bkabrda is there anything else left to address?

@wing328
wing328 merged commit 2cab048 into OpenAPITools:masterOct 14, 2019
@wing328

wing328 commented Oct 14, 2019

Copy link
Copy Markdown
Member

@shaxbee sorry for the delay. Just merged it. Thanks for your contribution.

@wing328wing328 added this to the 4.2.0 milestone Oct 30, 2019
@wing328

Copy link
Copy Markdown
Member

@shaxbee thanks for the PR, which has been included in v4.2.0 release: https://twitter.com/oas_generator/status/1189824932345069569

@shaxbee
shaxbee deleted the go-exp-required-fields-nullable branch February 10, 2020 06:56
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

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

[go-experimental] export required fields without pointer - #3989

Merged
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable
Oct 14, 2019
Merged

[go-experimental] export required fields without pointer#3989
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable

Conversation

@shaxbee

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

@bkabrda

Required fields are exposed without pointer, as they cannot be set to nil. This reduces boilerplate and GC pressure.
Omitempty tag is only used for fields that are neither required or nullable. This removes need for private member that breaks struct conversions. This also removes need for custom MarshalJSON that creates intermediary map increasing GC pressure.

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 see two cases where your implementation is problematic:

  • How would this work with a field that is required and nullable? AFAICS you'd have
    Foo int ``json:"foo"`` , but there's no way to serialize the explicit null in this scenario AFAICS.
  • For scenario where you have a non-required nullable field, how do you distinguish when the field is just null because it was initialized that way versus when the user explicitly set it null?

@shaxbeeshaxbeeSep 30, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes I totally agree, there is no differentiation between undefined and null in this case, but at least we don't introduce private members to what should be data only struct.

In case of required and nullable field since omitempty tag is not there nil value will be emitted as null.

To avoid breaking copying and pasting struct we could model this as interface{} and use helper methods or accept the fact that we cannot differentiate between undefined and null till generics land in Go.

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.

As for the required and nullable field, you won't even be able to assign nil, because the type is not pointer - it's Foo int, not Foo *int.

but at least we don't introduce private members to what should be data only struct.

Why should it be a data only structure?

I feel like this is a sacrifice of feature completeness for getting a nicer code, which I'm not in favor of.

@bkabrdabkabrdaSep 30, 2019

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.

(Just to add to my previous point, I'd love to be able to simplify this and I'm all for someone doing that. I just don't think that this PR is sufficient, as it sacrifices feature completeness for a bit less boilerplate (which is generated anyway) and a bit of improvement for GC which I honestly don't think would be noticable. Maybe there's a way to modify this PR to make it cover all the cases (a way that I don't see) and I'd be more than happy to give it a thumbsup if you found it.)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You are correct, it should be pointer type, I will add it.

Regarding copying, if you copy subset of fields instead of whole object information about field being explicitly null is lost. I also think that gc pressure shouldn't be dismissed here, on every marshaling map is allocated and each value is converted into heap-referenced GC object.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

@bkabrdabkabrdaSep 30, 2019

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.

So right now you have

{{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}}

but if you want to export all nullable fields as pointers (as your last commit message suggests), you should do

{{#isNullable}}*{{/isNullable}}{{{dataType}}}

Am I missing somethings?

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

I honestly don't know what you mean by that. Could you provide an example of what this would look like?

@shaxbeeshaxbeeOct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You're absolutely right, required and nullable don't mix well in this case.

Added Nullable types to the templates. I need to probably override dataType in codegen for nullable types. I need to add Get/Set operations for nullable types and SetExplicitNull method.

Nullable types implement their own MarshalJSON/UnmarshalJSON avoiding need for intermediate map.
This approach guarantees that if we copy field value the information about explicit null is not lost, eg.

src:=Foo{}
src.SetBarExplicitNull(true)
dst:=Foo{
Bar: src.Bar
}

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 8971b82 to 5421593CompareSeptember 30, 2019 17:52
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

This is currently broken due to #3988

@etherealjoy

Copy link
Copy Markdown
Contributor

Apparently the master changed when I merged it.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy The build on branch failed and master is broken as well :-(

@etherealjoy

Copy link
Copy Markdown
Contributor

I regenerated it again after rebase. #4000
The #3988 solved some build issue on the test files.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

Thanks a lot! :-)

@wing328

Copy link
Copy Markdown
Member

Updates samples via 3c4f512. Let's see how it goes.

@etherealjoy

Copy link
Copy Markdown
Contributor

a rebase is probably needed right?

@wing328

Copy link
Copy Markdown
Member
rspec ./spec/api_client_spec.rb:158 # Petstore::ApiClient#build_collection_param fails for invalid collection format

We got the same error in the master as well.

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 3c4f512 to e5f3229CompareOctober 3, 2019 22:45
@shaxbee

shaxbee commented Oct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

@wing328 after rebase i'm still getting type generated incorrectly, what command do you use to generate code?

EDIT: fixed itself after mvn package :-)

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from e5f3229 to 73fa582CompareOctober 3, 2019 23:16
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 73fa582 to ad5dafaCompareOctober 3, 2019 23:17
@bkabrda

Copy link
Copy Markdown
Contributor

So I think this is starting to look very promising. It may still require couple of tweaks though; I'll try to do a detailed review during today.

@bkabrdabkabrda 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 left a couple comments inline that I think should be taken care of, but otherwise this looks good. I'll try to test the generated code next, although that will probably take me some more time.

Comment threadmodules/openapi-generator/src/main/resources/go-experimental/model.mustache Outdated
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 4b05f17 to fe7ca62CompareOctober 4, 2019 14:16
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@bkabrda is there anything else left to address?

@wing328
wing328 merged commit 2cab048 into OpenAPITools:masterOct 14, 2019
@wing328

wing328 commented Oct 14, 2019

Copy link
Copy Markdown
Member

@shaxbee sorry for the delay. Just merged it. Thanks for your contribution.

@wing328wing328 added this to the 4.2.0 milestone Oct 30, 2019
@wing328

Copy link
Copy Markdown
Member

@shaxbee thanks for the PR, which has been included in v4.2.0 release: https://twitter.com/oas_generator/status/1189824932345069569

@shaxbee
shaxbee deleted the go-exp-required-fields-nullable branch February 10, 2020 06:56
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

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

[go-experimental] export required fields without pointer - #3989

Merged
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable
Oct 14, 2019
Merged

[go-experimental] export required fields without pointer#3989
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable

Conversation

@shaxbee

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

@bkabrda

Required fields are exposed without pointer, as they cannot be set to nil. This reduces boilerplate and GC pressure.
Omitempty tag is only used for fields that are neither required or nullable. This removes need for private member that breaks struct conversions. This also removes need for custom MarshalJSON that creates intermediary map increasing GC pressure.

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 see two cases where your implementation is problematic:

  • How would this work with a field that is required and nullable? AFAICS you'd have
    Foo int ``json:"foo"`` , but there's no way to serialize the explicit null in this scenario AFAICS.
  • For scenario where you have a non-required nullable field, how do you distinguish when the field is just null because it was initialized that way versus when the user explicitly set it null?

@shaxbeeshaxbeeSep 30, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes I totally agree, there is no differentiation between undefined and null in this case, but at least we don't introduce private members to what should be data only struct.

In case of required and nullable field since omitempty tag is not there nil value will be emitted as null.

To avoid breaking copying and pasting struct we could model this as interface{} and use helper methods or accept the fact that we cannot differentiate between undefined and null till generics land in Go.

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.

As for the required and nullable field, you won't even be able to assign nil, because the type is not pointer - it's Foo int, not Foo *int.

but at least we don't introduce private members to what should be data only struct.

Why should it be a data only structure?

I feel like this is a sacrifice of feature completeness for getting a nicer code, which I'm not in favor of.

@bkabrdabkabrdaSep 30, 2019

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.

(Just to add to my previous point, I'd love to be able to simplify this and I'm all for someone doing that. I just don't think that this PR is sufficient, as it sacrifices feature completeness for a bit less boilerplate (which is generated anyway) and a bit of improvement for GC which I honestly don't think would be noticable. Maybe there's a way to modify this PR to make it cover all the cases (a way that I don't see) and I'd be more than happy to give it a thumbsup if you found it.)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You are correct, it should be pointer type, I will add it.

Regarding copying, if you copy subset of fields instead of whole object information about field being explicitly null is lost. I also think that gc pressure shouldn't be dismissed here, on every marshaling map is allocated and each value is converted into heap-referenced GC object.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

@bkabrdabkabrdaSep 30, 2019

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.

So right now you have

{{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}}

but if you want to export all nullable fields as pointers (as your last commit message suggests), you should do

{{#isNullable}}*{{/isNullable}}{{{dataType}}}

Am I missing somethings?

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

I honestly don't know what you mean by that. Could you provide an example of what this would look like?

@shaxbeeshaxbeeOct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You're absolutely right, required and nullable don't mix well in this case.

Added Nullable types to the templates. I need to probably override dataType in codegen for nullable types. I need to add Get/Set operations for nullable types and SetExplicitNull method.

Nullable types implement their own MarshalJSON/UnmarshalJSON avoiding need for intermediate map.
This approach guarantees that if we copy field value the information about explicit null is not lost, eg.

src:=Foo{}
src.SetBarExplicitNull(true)
dst:=Foo{
Bar: src.Bar
}

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 8971b82 to 5421593CompareSeptember 30, 2019 17:52
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

This is currently broken due to #3988

@etherealjoy

Copy link
Copy Markdown
Contributor

Apparently the master changed when I merged it.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy The build on branch failed and master is broken as well :-(

@etherealjoy

Copy link
Copy Markdown
Contributor

I regenerated it again after rebase. #4000
The #3988 solved some build issue on the test files.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

Thanks a lot! :-)

@wing328

Copy link
Copy Markdown
Member

Updates samples via 3c4f512. Let's see how it goes.

@etherealjoy

Copy link
Copy Markdown
Contributor

a rebase is probably needed right?

@wing328

Copy link
Copy Markdown
Member
rspec ./spec/api_client_spec.rb:158 # Petstore::ApiClient#build_collection_param fails for invalid collection format

We got the same error in the master as well.

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 3c4f512 to e5f3229CompareOctober 3, 2019 22:45
@shaxbee

shaxbee commented Oct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

@wing328 after rebase i'm still getting type generated incorrectly, what command do you use to generate code?

EDIT: fixed itself after mvn package :-)

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from e5f3229 to 73fa582CompareOctober 3, 2019 23:16
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 73fa582 to ad5dafaCompareOctober 3, 2019 23:17
@bkabrda

Copy link
Copy Markdown
Contributor

So I think this is starting to look very promising. It may still require couple of tweaks though; I'll try to do a detailed review during today.

@bkabrdabkabrda 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 left a couple comments inline that I think should be taken care of, but otherwise this looks good. I'll try to test the generated code next, although that will probably take me some more time.

Comment threadmodules/openapi-generator/src/main/resources/go-experimental/model.mustache Outdated
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 4b05f17 to fe7ca62CompareOctober 4, 2019 14:16
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@bkabrda is there anything else left to address?

@wing328
wing328 merged commit 2cab048 into OpenAPITools:masterOct 14, 2019
@wing328

wing328 commented Oct 14, 2019

Copy link
Copy Markdown
Member

@shaxbee sorry for the delay. Just merged it. Thanks for your contribution.

@wing328wing328 added this to the 4.2.0 milestone Oct 30, 2019
@wing328

Copy link
Copy Markdown
Member

@shaxbee thanks for the PR, which has been included in v4.2.0 release: https://twitter.com/oas_generator/status/1189824932345069569

@shaxbee
shaxbee deleted the go-exp-required-fields-nullable branch February 10, 2020 06:56
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

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

[go-experimental] export required fields without pointer - #3989

Merged
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable
Oct 14, 2019
Merged

[go-experimental] export required fields without pointer#3989
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable

Conversation

@shaxbee

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

@bkabrda

Required fields are exposed without pointer, as they cannot be set to nil. This reduces boilerplate and GC pressure.
Omitempty tag is only used for fields that are neither required or nullable. This removes need for private member that breaks struct conversions. This also removes need for custom MarshalJSON that creates intermediary map increasing GC pressure.

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 see two cases where your implementation is problematic:

  • How would this work with a field that is required and nullable? AFAICS you'd have
    Foo int ``json:"foo"`` , but there's no way to serialize the explicit null in this scenario AFAICS.
  • For scenario where you have a non-required nullable field, how do you distinguish when the field is just null because it was initialized that way versus when the user explicitly set it null?

@shaxbeeshaxbeeSep 30, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes I totally agree, there is no differentiation between undefined and null in this case, but at least we don't introduce private members to what should be data only struct.

In case of required and nullable field since omitempty tag is not there nil value will be emitted as null.

To avoid breaking copying and pasting struct we could model this as interface{} and use helper methods or accept the fact that we cannot differentiate between undefined and null till generics land in Go.

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.

As for the required and nullable field, you won't even be able to assign nil, because the type is not pointer - it's Foo int, not Foo *int.

but at least we don't introduce private members to what should be data only struct.

Why should it be a data only structure?

I feel like this is a sacrifice of feature completeness for getting a nicer code, which I'm not in favor of.

@bkabrdabkabrdaSep 30, 2019

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.

(Just to add to my previous point, I'd love to be able to simplify this and I'm all for someone doing that. I just don't think that this PR is sufficient, as it sacrifices feature completeness for a bit less boilerplate (which is generated anyway) and a bit of improvement for GC which I honestly don't think would be noticable. Maybe there's a way to modify this PR to make it cover all the cases (a way that I don't see) and I'd be more than happy to give it a thumbsup if you found it.)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You are correct, it should be pointer type, I will add it.

Regarding copying, if you copy subset of fields instead of whole object information about field being explicitly null is lost. I also think that gc pressure shouldn't be dismissed here, on every marshaling map is allocated and each value is converted into heap-referenced GC object.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

@bkabrdabkabrdaSep 30, 2019

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.

So right now you have

{{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}}

but if you want to export all nullable fields as pointers (as your last commit message suggests), you should do

{{#isNullable}}*{{/isNullable}}{{{dataType}}}

Am I missing somethings?

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

I honestly don't know what you mean by that. Could you provide an example of what this would look like?

@shaxbeeshaxbeeOct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You're absolutely right, required and nullable don't mix well in this case.

Added Nullable types to the templates. I need to probably override dataType in codegen for nullable types. I need to add Get/Set operations for nullable types and SetExplicitNull method.

Nullable types implement their own MarshalJSON/UnmarshalJSON avoiding need for intermediate map.
This approach guarantees that if we copy field value the information about explicit null is not lost, eg.

src:=Foo{}
src.SetBarExplicitNull(true)
dst:=Foo{
Bar: src.Bar
}

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 8971b82 to 5421593CompareSeptember 30, 2019 17:52
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

This is currently broken due to #3988

@etherealjoy

Copy link
Copy Markdown
Contributor

Apparently the master changed when I merged it.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy The build on branch failed and master is broken as well :-(

@etherealjoy

Copy link
Copy Markdown
Contributor

I regenerated it again after rebase. #4000
The #3988 solved some build issue on the test files.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

Thanks a lot! :-)

@wing328

Copy link
Copy Markdown
Member

Updates samples via 3c4f512. Let's see how it goes.

@etherealjoy

Copy link
Copy Markdown
Contributor

a rebase is probably needed right?

@wing328

Copy link
Copy Markdown
Member
rspec ./spec/api_client_spec.rb:158 # Petstore::ApiClient#build_collection_param fails for invalid collection format

We got the same error in the master as well.

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 3c4f512 to e5f3229CompareOctober 3, 2019 22:45
@shaxbee

shaxbee commented Oct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

@wing328 after rebase i'm still getting type generated incorrectly, what command do you use to generate code?

EDIT: fixed itself after mvn package :-)

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from e5f3229 to 73fa582CompareOctober 3, 2019 23:16
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 73fa582 to ad5dafaCompareOctober 3, 2019 23:17
@bkabrda

Copy link
Copy Markdown
Contributor

So I think this is starting to look very promising. It may still require couple of tweaks though; I'll try to do a detailed review during today.

@bkabrdabkabrda 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 left a couple comments inline that I think should be taken care of, but otherwise this looks good. I'll try to test the generated code next, although that will probably take me some more time.

Comment threadmodules/openapi-generator/src/main/resources/go-experimental/model.mustache Outdated
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 4b05f17 to fe7ca62CompareOctober 4, 2019 14:16
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@bkabrda is there anything else left to address?

@wing328
wing328 merged commit 2cab048 into OpenAPITools:masterOct 14, 2019
@wing328

wing328 commented Oct 14, 2019

Copy link
Copy Markdown
Member

@shaxbee sorry for the delay. Just merged it. Thanks for your contribution.

@wing328wing328 added this to the 4.2.0 milestone Oct 30, 2019
@wing328

Copy link
Copy Markdown
Member

@shaxbee thanks for the PR, which has been included in v4.2.0 release: https://twitter.com/oas_generator/status/1189824932345069569

@shaxbee
shaxbee deleted the go-exp-required-fields-nullable branch February 10, 2020 06:56
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

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

[go-experimental] export required fields without pointer - #3989

Merged
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable
Oct 14, 2019
Merged

[go-experimental] export required fields without pointer#3989
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable

Conversation

@shaxbee

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

@bkabrda

Required fields are exposed without pointer, as they cannot be set to nil. This reduces boilerplate and GC pressure.
Omitempty tag is only used for fields that are neither required or nullable. This removes need for private member that breaks struct conversions. This also removes need for custom MarshalJSON that creates intermediary map increasing GC pressure.

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 see two cases where your implementation is problematic:

  • How would this work with a field that is required and nullable? AFAICS you'd have
    Foo int ``json:"foo"`` , but there's no way to serialize the explicit null in this scenario AFAICS.
  • For scenario where you have a non-required nullable field, how do you distinguish when the field is just null because it was initialized that way versus when the user explicitly set it null?

@shaxbeeshaxbeeSep 30, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes I totally agree, there is no differentiation between undefined and null in this case, but at least we don't introduce private members to what should be data only struct.

In case of required and nullable field since omitempty tag is not there nil value will be emitted as null.

To avoid breaking copying and pasting struct we could model this as interface{} and use helper methods or accept the fact that we cannot differentiate between undefined and null till generics land in Go.

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.

As for the required and nullable field, you won't even be able to assign nil, because the type is not pointer - it's Foo int, not Foo *int.

but at least we don't introduce private members to what should be data only struct.

Why should it be a data only structure?

I feel like this is a sacrifice of feature completeness for getting a nicer code, which I'm not in favor of.

@bkabrdabkabrdaSep 30, 2019

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.

(Just to add to my previous point, I'd love to be able to simplify this and I'm all for someone doing that. I just don't think that this PR is sufficient, as it sacrifices feature completeness for a bit less boilerplate (which is generated anyway) and a bit of improvement for GC which I honestly don't think would be noticable. Maybe there's a way to modify this PR to make it cover all the cases (a way that I don't see) and I'd be more than happy to give it a thumbsup if you found it.)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You are correct, it should be pointer type, I will add it.

Regarding copying, if you copy subset of fields instead of whole object information about field being explicitly null is lost. I also think that gc pressure shouldn't be dismissed here, on every marshaling map is allocated and each value is converted into heap-referenced GC object.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

@bkabrdabkabrdaSep 30, 2019

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.

So right now you have

{{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}}

but if you want to export all nullable fields as pointers (as your last commit message suggests), you should do

{{#isNullable}}*{{/isNullable}}{{{dataType}}}

Am I missing somethings?

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

I honestly don't know what you mean by that. Could you provide an example of what this would look like?

@shaxbeeshaxbeeOct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You're absolutely right, required and nullable don't mix well in this case.

Added Nullable types to the templates. I need to probably override dataType in codegen for nullable types. I need to add Get/Set operations for nullable types and SetExplicitNull method.

Nullable types implement their own MarshalJSON/UnmarshalJSON avoiding need for intermediate map.
This approach guarantees that if we copy field value the information about explicit null is not lost, eg.

src:=Foo{}
src.SetBarExplicitNull(true)
dst:=Foo{
Bar: src.Bar
}

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 8971b82 to 5421593CompareSeptember 30, 2019 17:52
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

This is currently broken due to #3988

@etherealjoy

Copy link
Copy Markdown
Contributor

Apparently the master changed when I merged it.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy The build on branch failed and master is broken as well :-(

@etherealjoy

Copy link
Copy Markdown
Contributor

I regenerated it again after rebase. #4000
The #3988 solved some build issue on the test files.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

Thanks a lot! :-)

@wing328

Copy link
Copy Markdown
Member

Updates samples via 3c4f512. Let's see how it goes.

@etherealjoy

Copy link
Copy Markdown
Contributor

a rebase is probably needed right?

@wing328

Copy link
Copy Markdown
Member
rspec ./spec/api_client_spec.rb:158 # Petstore::ApiClient#build_collection_param fails for invalid collection format

We got the same error in the master as well.

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 3c4f512 to e5f3229CompareOctober 3, 2019 22:45
@shaxbee

shaxbee commented Oct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

@wing328 after rebase i'm still getting type generated incorrectly, what command do you use to generate code?

EDIT: fixed itself after mvn package :-)

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from e5f3229 to 73fa582CompareOctober 3, 2019 23:16
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 73fa582 to ad5dafaCompareOctober 3, 2019 23:17
@bkabrda

Copy link
Copy Markdown
Contributor

So I think this is starting to look very promising. It may still require couple of tweaks though; I'll try to do a detailed review during today.

@bkabrdabkabrda 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 left a couple comments inline that I think should be taken care of, but otherwise this looks good. I'll try to test the generated code next, although that will probably take me some more time.

Comment threadmodules/openapi-generator/src/main/resources/go-experimental/model.mustache Outdated
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 4b05f17 to fe7ca62CompareOctober 4, 2019 14:16
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@bkabrda is there anything else left to address?

@wing328
wing328 merged commit 2cab048 into OpenAPITools:masterOct 14, 2019
@wing328

wing328 commented Oct 14, 2019

Copy link
Copy Markdown
Member

@shaxbee sorry for the delay. Just merged it. Thanks for your contribution.

@wing328wing328 added this to the 4.2.0 milestone Oct 30, 2019
@wing328

Copy link
Copy Markdown
Member

@shaxbee thanks for the PR, which has been included in v4.2.0 release: https://twitter.com/oas_generator/status/1189824932345069569

@shaxbee
shaxbee deleted the go-exp-required-fields-nullable branch February 10, 2020 06:56
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

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

[go-experimental] export required fields without pointer - #3989

Merged
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable
Oct 14, 2019
Merged

[go-experimental] export required fields without pointer#3989
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable

Conversation

@shaxbee

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

@bkabrda

Required fields are exposed without pointer, as they cannot be set to nil. This reduces boilerplate and GC pressure.
Omitempty tag is only used for fields that are neither required or nullable. This removes need for private member that breaks struct conversions. This also removes need for custom MarshalJSON that creates intermediary map increasing GC pressure.

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 see two cases where your implementation is problematic:

  • How would this work with a field that is required and nullable? AFAICS you'd have
    Foo int ``json:"foo"`` , but there's no way to serialize the explicit null in this scenario AFAICS.
  • For scenario where you have a non-required nullable field, how do you distinguish when the field is just null because it was initialized that way versus when the user explicitly set it null?

@shaxbeeshaxbeeSep 30, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes I totally agree, there is no differentiation between undefined and null in this case, but at least we don't introduce private members to what should be data only struct.

In case of required and nullable field since omitempty tag is not there nil value will be emitted as null.

To avoid breaking copying and pasting struct we could model this as interface{} and use helper methods or accept the fact that we cannot differentiate between undefined and null till generics land in Go.

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.

As for the required and nullable field, you won't even be able to assign nil, because the type is not pointer - it's Foo int, not Foo *int.

but at least we don't introduce private members to what should be data only struct.

Why should it be a data only structure?

I feel like this is a sacrifice of feature completeness for getting a nicer code, which I'm not in favor of.

@bkabrdabkabrdaSep 30, 2019

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.

(Just to add to my previous point, I'd love to be able to simplify this and I'm all for someone doing that. I just don't think that this PR is sufficient, as it sacrifices feature completeness for a bit less boilerplate (which is generated anyway) and a bit of improvement for GC which I honestly don't think would be noticable. Maybe there's a way to modify this PR to make it cover all the cases (a way that I don't see) and I'd be more than happy to give it a thumbsup if you found it.)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You are correct, it should be pointer type, I will add it.

Regarding copying, if you copy subset of fields instead of whole object information about field being explicitly null is lost. I also think that gc pressure shouldn't be dismissed here, on every marshaling map is allocated and each value is converted into heap-referenced GC object.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

@bkabrdabkabrdaSep 30, 2019

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.

So right now you have

{{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}}

but if you want to export all nullable fields as pointers (as your last commit message suggests), you should do

{{#isNullable}}*{{/isNullable}}{{{dataType}}}

Am I missing somethings?

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

I honestly don't know what you mean by that. Could you provide an example of what this would look like?

@shaxbeeshaxbeeOct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You're absolutely right, required and nullable don't mix well in this case.

Added Nullable types to the templates. I need to probably override dataType in codegen for nullable types. I need to add Get/Set operations for nullable types and SetExplicitNull method.

Nullable types implement their own MarshalJSON/UnmarshalJSON avoiding need for intermediate map.
This approach guarantees that if we copy field value the information about explicit null is not lost, eg.

src:=Foo{}
src.SetBarExplicitNull(true)
dst:=Foo{
Bar: src.Bar
}

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 8971b82 to 5421593CompareSeptember 30, 2019 17:52
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

This is currently broken due to #3988

@etherealjoy

Copy link
Copy Markdown
Contributor

Apparently the master changed when I merged it.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy The build on branch failed and master is broken as well :-(

@etherealjoy

Copy link
Copy Markdown
Contributor

I regenerated it again after rebase. #4000
The #3988 solved some build issue on the test files.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

Thanks a lot! :-)

@wing328

Copy link
Copy Markdown
Member

Updates samples via 3c4f512. Let's see how it goes.

@etherealjoy

Copy link
Copy Markdown
Contributor

a rebase is probably needed right?

@wing328

Copy link
Copy Markdown
Member
rspec ./spec/api_client_spec.rb:158 # Petstore::ApiClient#build_collection_param fails for invalid collection format

We got the same error in the master as well.

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 3c4f512 to e5f3229CompareOctober 3, 2019 22:45
@shaxbee

shaxbee commented Oct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

@wing328 after rebase i'm still getting type generated incorrectly, what command do you use to generate code?

EDIT: fixed itself after mvn package :-)

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from e5f3229 to 73fa582CompareOctober 3, 2019 23:16
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 73fa582 to ad5dafaCompareOctober 3, 2019 23:17
@bkabrda

Copy link
Copy Markdown
Contributor

So I think this is starting to look very promising. It may still require couple of tweaks though; I'll try to do a detailed review during today.

@bkabrdabkabrda 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 left a couple comments inline that I think should be taken care of, but otherwise this looks good. I'll try to test the generated code next, although that will probably take me some more time.

Comment threadmodules/openapi-generator/src/main/resources/go-experimental/model.mustache Outdated
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 4b05f17 to fe7ca62CompareOctober 4, 2019 14:16
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@bkabrda is there anything else left to address?

@wing328
wing328 merged commit 2cab048 into OpenAPITools:masterOct 14, 2019
@wing328

wing328 commented Oct 14, 2019

Copy link
Copy Markdown
Member

@shaxbee sorry for the delay. Just merged it. Thanks for your contribution.

@wing328wing328 added this to the 4.2.0 milestone Oct 30, 2019
@wing328

Copy link
Copy Markdown
Member

@shaxbee thanks for the PR, which has been included in v4.2.0 release: https://twitter.com/oas_generator/status/1189824932345069569

@shaxbee
shaxbee deleted the go-exp-required-fields-nullable branch February 10, 2020 06:56
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

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

[go-experimental] export required fields without pointer - #3989

Merged
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable
Oct 14, 2019
Merged

[go-experimental] export required fields without pointer#3989
wing328 merged 6 commits into
OpenAPITools:masterfrom
shaxbee:go-exp-required-fields-nullable

Conversation

@shaxbee

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

@bkabrda

Required fields are exposed without pointer, as they cannot be set to nil. This reduces boilerplate and GC pressure.
Omitempty tag is only used for fields that are neither required or nullable. This removes need for private member that breaks struct conversions. This also removes need for custom MarshalJSON that creates intermediary map increasing GC pressure.

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 see two cases where your implementation is problematic:

  • How would this work with a field that is required and nullable? AFAICS you'd have
    Foo int ``json:"foo"`` , but there's no way to serialize the explicit null in this scenario AFAICS.
  • For scenario where you have a non-required nullable field, how do you distinguish when the field is just null because it was initialized that way versus when the user explicitly set it null?

@shaxbeeshaxbeeSep 30, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes I totally agree, there is no differentiation between undefined and null in this case, but at least we don't introduce private members to what should be data only struct.

In case of required and nullable field since omitempty tag is not there nil value will be emitted as null.

To avoid breaking copying and pasting struct we could model this as interface{} and use helper methods or accept the fact that we cannot differentiate between undefined and null till generics land in Go.

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.

As for the required and nullable field, you won't even be able to assign nil, because the type is not pointer - it's Foo int, not Foo *int.

but at least we don't introduce private members to what should be data only struct.

Why should it be a data only structure?

I feel like this is a sacrifice of feature completeness for getting a nicer code, which I'm not in favor of.

@bkabrdabkabrdaSep 30, 2019

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.

(Just to add to my previous point, I'd love to be able to simplify this and I'm all for someone doing that. I just don't think that this PR is sufficient, as it sacrifices feature completeness for a bit less boilerplate (which is generated anyway) and a bit of improvement for GC which I honestly don't think would be noticable. Maybe there's a way to modify this PR to make it cover all the cases (a way that I don't see) and I'd be more than happy to give it a thumbsup if you found it.)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You are correct, it should be pointer type, I will add it.

Regarding copying, if you copy subset of fields instead of whole object information about field being explicitly null is lost. I also think that gc pressure shouldn't be dismissed here, on every marshaling map is allocated and each value is converted into heap-referenced GC object.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

@bkabrdabkabrdaSep 30, 2019

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.

So right now you have

{{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}}

but if you want to export all nullable fields as pointers (as your last commit message suggests), you should do

{{#isNullable}}*{{/isNullable}}{{{dataType}}}

Am I missing somethings?

Coming to think about it - we could simply generate Nullable types and Ptr methods for object schemas and this way support explicit null.

I honestly don't know what you mean by that. Could you provide an example of what this would look like?

@shaxbeeshaxbeeOct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

You're absolutely right, required and nullable don't mix well in this case.

Added Nullable types to the templates. I need to probably override dataType in codegen for nullable types. I need to add Get/Set operations for nullable types and SetExplicitNull method.

Nullable types implement their own MarshalJSON/UnmarshalJSON avoiding need for intermediate map.
This approach guarantees that if we copy field value the information about explicit null is not lost, eg.

src:=Foo{}
src.SetBarExplicitNull(true)
dst:=Foo{
Bar: src.Bar
}

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 8971b82 to 5421593CompareSeptember 30, 2019 17:52
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

This is currently broken due to #3988

@etherealjoy

Copy link
Copy Markdown
Contributor

Apparently the master changed when I merged it.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@etherealjoy The build on branch failed and master is broken as well :-(

@etherealjoy

Copy link
Copy Markdown
Contributor

I regenerated it again after rebase. #4000
The #3988 solved some build issue on the test files.

@shaxbee

Copy link
Copy Markdown
ContributorAuthor

Thanks a lot! :-)

@wing328

Copy link
Copy Markdown
Member

Updates samples via 3c4f512. Let's see how it goes.

@etherealjoy

Copy link
Copy Markdown
Contributor

a rebase is probably needed right?

@wing328

Copy link
Copy Markdown
Member
rspec ./spec/api_client_spec.rb:158 # Petstore::ApiClient#build_collection_param fails for invalid collection format

We got the same error in the master as well.

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 3c4f512 to e5f3229CompareOctober 3, 2019 22:45
@shaxbee

shaxbee commented Oct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

@wing328 after rebase i'm still getting type generated incorrectly, what command do you use to generate code?

EDIT: fixed itself after mvn package :-)

@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from e5f3229 to 73fa582CompareOctober 3, 2019 23:16
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 73fa582 to ad5dafaCompareOctober 3, 2019 23:17
@bkabrda

Copy link
Copy Markdown
Contributor

So I think this is starting to look very promising. It may still require couple of tweaks though; I'll try to do a detailed review during today.

@bkabrdabkabrda 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 left a couple comments inline that I think should be taken care of, but otherwise this looks good. I'll try to test the generated code next, although that will probably take me some more time.

Comment threadmodules/openapi-generator/src/main/resources/go-experimental/model.mustache Outdated
@shaxbee
shaxbeeforce-pushed the go-exp-required-fields-nullable branch from 4b05f17 to fe7ca62CompareOctober 4, 2019 14:16
@shaxbee

Copy link
Copy Markdown
ContributorAuthor

@bkabrda is there anything else left to address?

@wing328
wing328 merged commit 2cab048 into OpenAPITools:masterOct 14, 2019
@wing328

wing328 commented Oct 14, 2019

Copy link
Copy Markdown
Member

@shaxbee sorry for the delay. Just merged it. Thanks for your contribution.

@wing328wing328 added this to the 4.2.0 milestone Oct 30, 2019
@wing328

Copy link
Copy Markdown
Member

@shaxbee thanks for the PR, which has been included in v4.2.0 release: https://twitter.com/oas_generator/status/1189824932345069569

@shaxbee
shaxbee deleted the go-exp-required-fields-nullable branch February 10, 2020 06:56
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

@shaxbee@etherealjoy@wing328@bkabrda