Skip to content

[core] fix referenced enum case - #2175

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum
Feb 19, 2019
Merged

[core] fix referenced enum case#2175
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum

Conversation

@jmini

@jminijmini commented Feb 18, 2019

Copy link
Copy Markdown
Member

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. Change in the core: @OpenAPITools/generator-core-team

Description of the PR

Fixes#2127

Follow up of PR #1981

When you have a default value defined, in the outer enum case (where a seperated enum file is created) the default value was only working for the string type.

This PR address the issue.


Tested with a spec having this outer enum cases:

components:
schemas:
IntEnum:
type: integerformat: int32default: 2enum:
- 1
- 2
- 3LongEnum:
type: integerformat: int64default: 30enum:
- 20
- 30
- 40StringEnum:
type: stringdefault: "b"enum:
- "c"
- "b"
- "a"EnumWithCustomName:
type: integerformat: int32default: 2enum:
- 1
- 2x-enum-varnames:
- FOO
- BAR

And following schema:

ObjWithEnumProperties:
type: objectproperties:
iprop:
$ref: "#/components/schemas/IntEnum"lprop:
$ref: "#/components/schemas/LongEnum"sprop:
$ref: "#/components/schemas/StringEnum"custom:
$ref: "#/components/schemas/EnumWithCustomName"

The change is made in the core and I think that a lot of generators are impacted.
I have tested it for different java generators.
Setting a modelNamePrefix should also be considered during tests.

I recommend to try other generators/config as well.

@auto-labeler

Copy link
Copy Markdown

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@fuj1g0n

Copy link
Copy Markdown

great work!
I installed your branch locally and confirmed it works perfectly :)

@wing328wing328 added this to the 4.0.0 milestone Feb 19, 2019
@wing328

Copy link
Copy Markdown
Member

@jmini thanks for the PR 👍

@fujigon thanks for testing the fix.

@wing328
wing328 merged commit fda867e into OpenAPITools:masterFeb 19, 2019
jimschubert added a commit that referenced this pull request Feb 23, 2019
* master: (40 commits)
[Python] remove default value from being fallback to example (#2213)
Add petstore integration tests to Ruby OAS3 client (#2211)
Gradle - make GenerateTask properties optional (#2185)
skip bats installation (#2198)
Something in the dependencies changed. This switch is no longer needed. (#1850)
Use oauth token for basic bearer auth in Rust. (#2161)
Fix missing nullable (#2189)
Enable error handling in Java WebClient library, fixes#1243 (#1244)
[core] fix referenced enum case (#2175)
rest-template: allow array parameters in path using collectionFormat (#2177)
update go petstore samples
Fix string types for cpprestsdk client generator (#1676)
update kotline samples
Remove API Key Authentication code for go when cookie is used. (#1601)
changed the package install instructions to install the .tgz package … (#1989)
okhttp-gson: allow array parameters in path using collectionFormat (#2137)
[Ruby] Fix regualr expression in error message (#2069) (#2139)
[kotlin][client] bytearray conversion (#2166)
[rust-server] Added client documentation to rust-server (#2159)
[Java] Getter/Setter naming convention not followed in generated models (#2095)
...
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.

[BUG][Java] default value in referenced Enum produces corrupted code

3 participants

@jmini@fuj1g0n@wing328
, '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" + '
[core] fix referenced enum case by jmini · Pull Request #2175 · OpenAPITools/openapi-generator · GitHub
Skip to content

[core] fix referenced enum case - #2175

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum
Feb 19, 2019
Merged

[core] fix referenced enum case#2175
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum

Conversation

@jmini

@jminijmini commented Feb 18, 2019

Copy link
Copy Markdown
Member

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. Change in the core: @OpenAPITools/generator-core-team

Description of the PR

Fixes#2127

Follow up of PR #1981

When you have a default value defined, in the outer enum case (where a seperated enum file is created) the default value was only working for the string type.

This PR address the issue.


Tested with a spec having this outer enum cases:

components:
schemas:
IntEnum:
type: integerformat: int32default: 2enum:
- 1
- 2
- 3LongEnum:
type: integerformat: int64default: 30enum:
- 20
- 30
- 40StringEnum:
type: stringdefault: "b"enum:
- "c"
- "b"
- "a"EnumWithCustomName:
type: integerformat: int32default: 2enum:
- 1
- 2x-enum-varnames:
- FOO
- BAR

And following schema:

ObjWithEnumProperties:
type: objectproperties:
iprop:
$ref: "#/components/schemas/IntEnum"lprop:
$ref: "#/components/schemas/LongEnum"sprop:
$ref: "#/components/schemas/StringEnum"custom:
$ref: "#/components/schemas/EnumWithCustomName"

The change is made in the core and I think that a lot of generators are impacted.
I have tested it for different java generators.
Setting a modelNamePrefix should also be considered during tests.

I recommend to try other generators/config as well.

@auto-labeler

Copy link
Copy Markdown

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@fuj1g0n

Copy link
Copy Markdown

great work!
I installed your branch locally and confirmed it works perfectly :)

@wing328wing328 added this to the 4.0.0 milestone Feb 19, 2019
@wing328

Copy link
Copy Markdown
Member

@jmini thanks for the PR 👍

@fujigon thanks for testing the fix.

@wing328
wing328 merged commit fda867e into OpenAPITools:masterFeb 19, 2019
jimschubert added a commit that referenced this pull request Feb 23, 2019
* master: (40 commits)
[Python] remove default value from being fallback to example (#2213)
Add petstore integration tests to Ruby OAS3 client (#2211)
Gradle - make GenerateTask properties optional (#2185)
skip bats installation (#2198)
Something in the dependencies changed. This switch is no longer needed. (#1850)
Use oauth token for basic bearer auth in Rust. (#2161)
Fix missing nullable (#2189)
Enable error handling in Java WebClient library, fixes#1243 (#1244)
[core] fix referenced enum case (#2175)
rest-template: allow array parameters in path using collectionFormat (#2177)
update go petstore samples
Fix string types for cpprestsdk client generator (#1676)
update kotline samples
Remove API Key Authentication code for go when cookie is used. (#1601)
changed the package install instructions to install the .tgz package … (#1989)
okhttp-gson: allow array parameters in path using collectionFormat (#2137)
[Ruby] Fix regualr expression in error message (#2069) (#2139)
[kotlin][client] bytearray conversion (#2166)
[rust-server] Added client documentation to rust-server (#2159)
[Java] Getter/Setter naming convention not followed in generated models (#2095)
...
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.

[BUG][Java] default value in referenced Enum produces corrupted code

3 participants

@jmini@fuj1g0n@wing328
, '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('^' + ".*" + ' [core] fix referenced enum case by jmini · Pull Request #2175 · OpenAPITools/openapi-generator · GitHub
Skip to content

[core] fix referenced enum case - #2175

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum
Feb 19, 2019
Merged

[core] fix referenced enum case#2175
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum

Conversation

@jmini

@jminijmini commented Feb 18, 2019

Copy link
Copy Markdown
Member

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. Change in the core: @OpenAPITools/generator-core-team

Description of the PR

Fixes#2127

Follow up of PR #1981

When you have a default value defined, in the outer enum case (where a seperated enum file is created) the default value was only working for the string type.

This PR address the issue.


Tested with a spec having this outer enum cases:

components:
schemas:
IntEnum:
type: integerformat: int32default: 2enum:
- 1
- 2
- 3LongEnum:
type: integerformat: int64default: 30enum:
- 20
- 30
- 40StringEnum:
type: stringdefault: "b"enum:
- "c"
- "b"
- "a"EnumWithCustomName:
type: integerformat: int32default: 2enum:
- 1
- 2x-enum-varnames:
- FOO
- BAR

And following schema:

ObjWithEnumProperties:
type: objectproperties:
iprop:
$ref: "#/components/schemas/IntEnum"lprop:
$ref: "#/components/schemas/LongEnum"sprop:
$ref: "#/components/schemas/StringEnum"custom:
$ref: "#/components/schemas/EnumWithCustomName"

The change is made in the core and I think that a lot of generators are impacted.
I have tested it for different java generators.
Setting a modelNamePrefix should also be considered during tests.

I recommend to try other generators/config as well.

@auto-labeler

Copy link
Copy Markdown

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@fuj1g0n

Copy link
Copy Markdown

great work!
I installed your branch locally and confirmed it works perfectly :)

@wing328wing328 added this to the 4.0.0 milestone Feb 19, 2019
@wing328

Copy link
Copy Markdown
Member

@jmini thanks for the PR 👍

@fujigon thanks for testing the fix.

@wing328
wing328 merged commit fda867e into OpenAPITools:masterFeb 19, 2019
jimschubert added a commit that referenced this pull request Feb 23, 2019
* master: (40 commits)
[Python] remove default value from being fallback to example (#2213)
Add petstore integration tests to Ruby OAS3 client (#2211)
Gradle - make GenerateTask properties optional (#2185)
skip bats installation (#2198)
Something in the dependencies changed. This switch is no longer needed. (#1850)
Use oauth token for basic bearer auth in Rust. (#2161)
Fix missing nullable (#2189)
Enable error handling in Java WebClient library, fixes#1243 (#1244)
[core] fix referenced enum case (#2175)
rest-template: allow array parameters in path using collectionFormat (#2177)
update go petstore samples
Fix string types for cpprestsdk client generator (#1676)
update kotline samples
Remove API Key Authentication code for go when cookie is used. (#1601)
changed the package install instructions to install the .tgz package … (#1989)
okhttp-gson: allow array parameters in path using collectionFormat (#2137)
[Ruby] Fix regualr expression in error message (#2069) (#2139)
[kotlin][client] bytearray conversion (#2166)
[rust-server] Added client documentation to rust-server (#2159)
[Java] Getter/Setter naming convention not followed in generated models (#2095)
...
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.

[BUG][Java] default value in referenced Enum produces corrupted code

3 participants

@jmini@fuj1g0n@wing328
, '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('^' + ".*" + ' [core] fix referenced enum case by jmini · Pull Request #2175 · OpenAPITools/openapi-generator · GitHub
Skip to content

[core] fix referenced enum case - #2175

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum
Feb 19, 2019
Merged

[core] fix referenced enum case#2175
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum

Conversation

@jmini

@jminijmini commented Feb 18, 2019

Copy link
Copy Markdown
Member

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. Change in the core: @OpenAPITools/generator-core-team

Description of the PR

Fixes#2127

Follow up of PR #1981

When you have a default value defined, in the outer enum case (where a seperated enum file is created) the default value was only working for the string type.

This PR address the issue.


Tested with a spec having this outer enum cases:

components:
schemas:
IntEnum:
type: integerformat: int32default: 2enum:
- 1
- 2
- 3LongEnum:
type: integerformat: int64default: 30enum:
- 20
- 30
- 40StringEnum:
type: stringdefault: "b"enum:
- "c"
- "b"
- "a"EnumWithCustomName:
type: integerformat: int32default: 2enum:
- 1
- 2x-enum-varnames:
- FOO
- BAR

And following schema:

ObjWithEnumProperties:
type: objectproperties:
iprop:
$ref: "#/components/schemas/IntEnum"lprop:
$ref: "#/components/schemas/LongEnum"sprop:
$ref: "#/components/schemas/StringEnum"custom:
$ref: "#/components/schemas/EnumWithCustomName"

The change is made in the core and I think that a lot of generators are impacted.
I have tested it for different java generators.
Setting a modelNamePrefix should also be considered during tests.

I recommend to try other generators/config as well.

@auto-labeler

Copy link
Copy Markdown

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@fuj1g0n

Copy link
Copy Markdown

great work!
I installed your branch locally and confirmed it works perfectly :)

@wing328wing328 added this to the 4.0.0 milestone Feb 19, 2019
@wing328

Copy link
Copy Markdown
Member

@jmini thanks for the PR 👍

@fujigon thanks for testing the fix.

@wing328
wing328 merged commit fda867e into OpenAPITools:masterFeb 19, 2019
jimschubert added a commit that referenced this pull request Feb 23, 2019
* master: (40 commits)
[Python] remove default value from being fallback to example (#2213)
Add petstore integration tests to Ruby OAS3 client (#2211)
Gradle - make GenerateTask properties optional (#2185)
skip bats installation (#2198)
Something in the dependencies changed. This switch is no longer needed. (#1850)
Use oauth token for basic bearer auth in Rust. (#2161)
Fix missing nullable (#2189)
Enable error handling in Java WebClient library, fixes#1243 (#1244)
[core] fix referenced enum case (#2175)
rest-template: allow array parameters in path using collectionFormat (#2177)
update go petstore samples
Fix string types for cpprestsdk client generator (#1676)
update kotline samples
Remove API Key Authentication code for go when cookie is used. (#1601)
changed the package install instructions to install the .tgz package … (#1989)
okhttp-gson: allow array parameters in path using collectionFormat (#2137)
[Ruby] Fix regualr expression in error message (#2069) (#2139)
[kotlin][client] bytearray conversion (#2166)
[rust-server] Added client documentation to rust-server (#2159)
[Java] Getter/Setter naming convention not followed in generated models (#2095)
...
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.

[BUG][Java] default value in referenced Enum produces corrupted code

3 participants

@jmini@fuj1g0n@wing328
, '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" + ' [core] fix referenced enum case by jmini · Pull Request #2175 · OpenAPITools/openapi-generator · GitHub
Skip to content

[core] fix referenced enum case - #2175

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum
Feb 19, 2019
Merged

[core] fix referenced enum case#2175
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum

Conversation

@jmini

@jminijmini commented Feb 18, 2019

Copy link
Copy Markdown
Member

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. Change in the core: @OpenAPITools/generator-core-team

Description of the PR

Fixes#2127

Follow up of PR #1981

When you have a default value defined, in the outer enum case (where a seperated enum file is created) the default value was only working for the string type.

This PR address the issue.


Tested with a spec having this outer enum cases:

components:
schemas:
IntEnum:
type: integerformat: int32default: 2enum:
- 1
- 2
- 3LongEnum:
type: integerformat: int64default: 30enum:
- 20
- 30
- 40StringEnum:
type: stringdefault: "b"enum:
- "c"
- "b"
- "a"EnumWithCustomName:
type: integerformat: int32default: 2enum:
- 1
- 2x-enum-varnames:
- FOO
- BAR

And following schema:

ObjWithEnumProperties:
type: objectproperties:
iprop:
$ref: "#/components/schemas/IntEnum"lprop:
$ref: "#/components/schemas/LongEnum"sprop:
$ref: "#/components/schemas/StringEnum"custom:
$ref: "#/components/schemas/EnumWithCustomName"

The change is made in the core and I think that a lot of generators are impacted.
I have tested it for different java generators.
Setting a modelNamePrefix should also be considered during tests.

I recommend to try other generators/config as well.

@auto-labeler

Copy link
Copy Markdown

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@fuj1g0n

Copy link
Copy Markdown

great work!
I installed your branch locally and confirmed it works perfectly :)

@wing328wing328 added this to the 4.0.0 milestone Feb 19, 2019
@wing328

Copy link
Copy Markdown
Member

@jmini thanks for the PR 👍

@fujigon thanks for testing the fix.

@wing328
wing328 merged commit fda867e into OpenAPITools:masterFeb 19, 2019
jimschubert added a commit that referenced this pull request Feb 23, 2019
* master: (40 commits)
[Python] remove default value from being fallback to example (#2213)
Add petstore integration tests to Ruby OAS3 client (#2211)
Gradle - make GenerateTask properties optional (#2185)
skip bats installation (#2198)
Something in the dependencies changed. This switch is no longer needed. (#1850)
Use oauth token for basic bearer auth in Rust. (#2161)
Fix missing nullable (#2189)
Enable error handling in Java WebClient library, fixes#1243 (#1244)
[core] fix referenced enum case (#2175)
rest-template: allow array parameters in path using collectionFormat (#2177)
update go petstore samples
Fix string types for cpprestsdk client generator (#1676)
update kotline samples
Remove API Key Authentication code for go when cookie is used. (#1601)
changed the package install instructions to install the .tgz package … (#1989)
okhttp-gson: allow array parameters in path using collectionFormat (#2137)
[Ruby] Fix regualr expression in error message (#2069) (#2139)
[kotlin][client] bytearray conversion (#2166)
[rust-server] Added client documentation to rust-server (#2159)
[Java] Getter/Setter naming convention not followed in generated models (#2095)
...
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.

[BUG][Java] default value in referenced Enum produces corrupted code

3 participants

@jmini@fuj1g0n@wing328
, '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('^' + ".*" + ' [core] fix referenced enum case by jmini · Pull Request #2175 · OpenAPITools/openapi-generator · GitHub
Skip to content

[core] fix referenced enum case - #2175

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum
Feb 19, 2019
Merged

[core] fix referenced enum case#2175
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum

Conversation

@jmini

@jminijmini commented Feb 18, 2019

Copy link
Copy Markdown
Member

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. Change in the core: @OpenAPITools/generator-core-team

Description of the PR

Fixes#2127

Follow up of PR #1981

When you have a default value defined, in the outer enum case (where a seperated enum file is created) the default value was only working for the string type.

This PR address the issue.


Tested with a spec having this outer enum cases:

components:
schemas:
IntEnum:
type: integerformat: int32default: 2enum:
- 1
- 2
- 3LongEnum:
type: integerformat: int64default: 30enum:
- 20
- 30
- 40StringEnum:
type: stringdefault: "b"enum:
- "c"
- "b"
- "a"EnumWithCustomName:
type: integerformat: int32default: 2enum:
- 1
- 2x-enum-varnames:
- FOO
- BAR

And following schema:

ObjWithEnumProperties:
type: objectproperties:
iprop:
$ref: "#/components/schemas/IntEnum"lprop:
$ref: "#/components/schemas/LongEnum"sprop:
$ref: "#/components/schemas/StringEnum"custom:
$ref: "#/components/schemas/EnumWithCustomName"

The change is made in the core and I think that a lot of generators are impacted.
I have tested it for different java generators.
Setting a modelNamePrefix should also be considered during tests.

I recommend to try other generators/config as well.

@auto-labeler

Copy link
Copy Markdown

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@fuj1g0n

Copy link
Copy Markdown

great work!
I installed your branch locally and confirmed it works perfectly :)

@wing328wing328 added this to the 4.0.0 milestone Feb 19, 2019
@wing328

Copy link
Copy Markdown
Member

@jmini thanks for the PR 👍

@fujigon thanks for testing the fix.

@wing328
wing328 merged commit fda867e into OpenAPITools:masterFeb 19, 2019
jimschubert added a commit that referenced this pull request Feb 23, 2019
* master: (40 commits)
[Python] remove default value from being fallback to example (#2213)
Add petstore integration tests to Ruby OAS3 client (#2211)
Gradle - make GenerateTask properties optional (#2185)
skip bats installation (#2198)
Something in the dependencies changed. This switch is no longer needed. (#1850)
Use oauth token for basic bearer auth in Rust. (#2161)
Fix missing nullable (#2189)
Enable error handling in Java WebClient library, fixes#1243 (#1244)
[core] fix referenced enum case (#2175)
rest-template: allow array parameters in path using collectionFormat (#2177)
update go petstore samples
Fix string types for cpprestsdk client generator (#1676)
update kotline samples
Remove API Key Authentication code for go when cookie is used. (#1601)
changed the package install instructions to install the .tgz package … (#1989)
okhttp-gson: allow array parameters in path using collectionFormat (#2137)
[Ruby] Fix regualr expression in error message (#2069) (#2139)
[kotlin][client] bytearray conversion (#2166)
[rust-server] Added client documentation to rust-server (#2159)
[Java] Getter/Setter naming convention not followed in generated models (#2095)
...
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.

[BUG][Java] default value in referenced Enum produces corrupted code

3 participants

@jmini@fuj1g0n@wing328
, '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('^' + ".*" + ' [core] fix referenced enum case by jmini · Pull Request #2175 · OpenAPITools/openapi-generator · GitHub
Skip to content

[core] fix referenced enum case - #2175

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum
Feb 19, 2019
Merged

[core] fix referenced enum case#2175
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum

Conversation

@jmini

@jminijmini commented Feb 18, 2019

Copy link
Copy Markdown
Member

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. Change in the core: @OpenAPITools/generator-core-team

Description of the PR

Fixes#2127

Follow up of PR #1981

When you have a default value defined, in the outer enum case (where a seperated enum file is created) the default value was only working for the string type.

This PR address the issue.


Tested with a spec having this outer enum cases:

components:
schemas:
IntEnum:
type: integerformat: int32default: 2enum:
- 1
- 2
- 3LongEnum:
type: integerformat: int64default: 30enum:
- 20
- 30
- 40StringEnum:
type: stringdefault: "b"enum:
- "c"
- "b"
- "a"EnumWithCustomName:
type: integerformat: int32default: 2enum:
- 1
- 2x-enum-varnames:
- FOO
- BAR

And following schema:

ObjWithEnumProperties:
type: objectproperties:
iprop:
$ref: "#/components/schemas/IntEnum"lprop:
$ref: "#/components/schemas/LongEnum"sprop:
$ref: "#/components/schemas/StringEnum"custom:
$ref: "#/components/schemas/EnumWithCustomName"

The change is made in the core and I think that a lot of generators are impacted.
I have tested it for different java generators.
Setting a modelNamePrefix should also be considered during tests.

I recommend to try other generators/config as well.

@auto-labeler

Copy link
Copy Markdown

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@fuj1g0n

Copy link
Copy Markdown

great work!
I installed your branch locally and confirmed it works perfectly :)

@wing328wing328 added this to the 4.0.0 milestone Feb 19, 2019
@wing328

Copy link
Copy Markdown
Member

@jmini thanks for the PR 👍

@fujigon thanks for testing the fix.

@wing328
wing328 merged commit fda867e into OpenAPITools:masterFeb 19, 2019
jimschubert added a commit that referenced this pull request Feb 23, 2019
* master: (40 commits)
[Python] remove default value from being fallback to example (#2213)
Add petstore integration tests to Ruby OAS3 client (#2211)
Gradle - make GenerateTask properties optional (#2185)
skip bats installation (#2198)
Something in the dependencies changed. This switch is no longer needed. (#1850)
Use oauth token for basic bearer auth in Rust. (#2161)
Fix missing nullable (#2189)
Enable error handling in Java WebClient library, fixes#1243 (#1244)
[core] fix referenced enum case (#2175)
rest-template: allow array parameters in path using collectionFormat (#2177)
update go petstore samples
Fix string types for cpprestsdk client generator (#1676)
update kotline samples
Remove API Key Authentication code for go when cookie is used. (#1601)
changed the package install instructions to install the .tgz package … (#1989)
okhttp-gson: allow array parameters in path using collectionFormat (#2137)
[Ruby] Fix regualr expression in error message (#2069) (#2139)
[kotlin][client] bytearray conversion (#2166)
[rust-server] Added client documentation to rust-server (#2159)
[Java] Getter/Setter naming convention not followed in generated models (#2095)
...
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.

[BUG][Java] default value in referenced Enum produces corrupted code

3 participants

@jmini@fuj1g0n@wing328
, '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); } })(); })(); [core] fix referenced enum case by jmini · Pull Request #2175 · OpenAPITools/openapi-generator · GitHub
Skip to content

[core] fix referenced enum case - #2175

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum
Feb 19, 2019
Merged

[core] fix referenced enum case#2175
wing328 merged 1 commit into
OpenAPITools:masterfrom
jmini:fix_referenced_enum

Conversation

@jmini

@jminijmini commented Feb 18, 2019

Copy link
Copy Markdown
Member

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. Change in the core: @OpenAPITools/generator-core-team

Description of the PR

Fixes#2127

Follow up of PR #1981

When you have a default value defined, in the outer enum case (where a seperated enum file is created) the default value was only working for the string type.

This PR address the issue.


Tested with a spec having this outer enum cases:

components:
schemas:
IntEnum:
type: integerformat: int32default: 2enum:
- 1
- 2
- 3LongEnum:
type: integerformat: int64default: 30enum:
- 20
- 30
- 40StringEnum:
type: stringdefault: "b"enum:
- "c"
- "b"
- "a"EnumWithCustomName:
type: integerformat: int32default: 2enum:
- 1
- 2x-enum-varnames:
- FOO
- BAR

And following schema:

ObjWithEnumProperties:
type: objectproperties:
iprop:
$ref: "#/components/schemas/IntEnum"lprop:
$ref: "#/components/schemas/LongEnum"sprop:
$ref: "#/components/schemas/StringEnum"custom:
$ref: "#/components/schemas/EnumWithCustomName"

The change is made in the core and I think that a lot of generators are impacted.
I have tested it for different java generators.
Setting a modelNamePrefix should also be considered during tests.

I recommend to try other generators/config as well.

@auto-labeler

Copy link
Copy Markdown

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@fuj1g0n

Copy link
Copy Markdown

great work!
I installed your branch locally and confirmed it works perfectly :)

@wing328wing328 added this to the 4.0.0 milestone Feb 19, 2019
@wing328

Copy link
Copy Markdown
Member

@jmini thanks for the PR 👍

@fujigon thanks for testing the fix.

@wing328
wing328 merged commit fda867e into OpenAPITools:masterFeb 19, 2019
jimschubert added a commit that referenced this pull request Feb 23, 2019
* master: (40 commits)
[Python] remove default value from being fallback to example (#2213)
Add petstore integration tests to Ruby OAS3 client (#2211)
Gradle - make GenerateTask properties optional (#2185)
skip bats installation (#2198)
Something in the dependencies changed. This switch is no longer needed. (#1850)
Use oauth token for basic bearer auth in Rust. (#2161)
Fix missing nullable (#2189)
Enable error handling in Java WebClient library, fixes#1243 (#1244)
[core] fix referenced enum case (#2175)
rest-template: allow array parameters in path using collectionFormat (#2177)
update go petstore samples
Fix string types for cpprestsdk client generator (#1676)
update kotline samples
Remove API Key Authentication code for go when cookie is used. (#1601)
changed the package install instructions to install the .tgz package … (#1989)
okhttp-gson: allow array parameters in path using collectionFormat (#2137)
[Ruby] Fix regualr expression in error message (#2069) (#2139)
[kotlin][client] bytearray conversion (#2166)
[rust-server] Added client documentation to rust-server (#2159)
[Java] Getter/Setter naming convention not followed in generated models (#2095)
...
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.

[BUG][Java] default value in referenced Enum produces corrupted code

3 participants

@jmini@fuj1g0n@wing328